Merge "Privacy Guard : Reimplement backed by AppOps" into cm-10.2

(cherry picked from commit 97dee3d9d2636c64afb6539998cccdfa753ffae0)

Conflicts:
	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