Merge "Revert "framework: Privacy Guard"" into cm-10.2
Conflicts:
	core/java/android/app/ApplicationPackageManager.java
	core/java/android/provider/Settings.java
	core/res/res/drawable-hdpi/stat_notify_privacy_guard.png
	core/res/res/drawable-mdpi/stat_notify_privacy_guard.png
	core/res/res/drawable-xhdpi/stat_notify_privacy_guard.png
	core/res/res/drawable-xxhdpi/stat_notify_privacy_guard.png
	core/res/res/values/cm_strings.xml
	core/res/res/values/symbols.xml
	services/java/com/android/server/pm/Settings.java
Merge "Privacy Guard : Reimplement backed by AppOps" into cm-10.2
Conflicts:
	core/res/res/drawable-hdpi/stat_notify_privacy_guard.png
	core/res/res/drawable-mdpi/stat_notify_privacy_guard.png
	core/res/res/drawable-xhdpi/stat_notify_privacy_guard.png
	core/res/res/drawable-xxhdpi/stat_notify_privacy_guard.png
	core/res/res/values/cm_strings.xml
	services/java/com/android/server/pm/PackageManagerService.java
fix merge