Active display: make sure mNotificaiton is set correctly

Change-Id: I4111ca843e340cca4d6dac4b2c2922ce3039e487
Active display: register/unregister recievers and listeners when enabled/disabled

Change-Id: Ic73e63da2c9634bc864ab1a1387eb9145eb0b5b0
Revert "framework: Privacy Guard"

Change-Id: I82ab85092e54c577a0817f3bedc85063c9a3054a

Conflicts:
	core/java/android/app/ActivityManagerNative.java
	core/java/android/content/ContextWrapper.java
	core/java/android/provider/Settings.java
	core/res/AndroidManifest.xml
	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/am/ActivityManagerService.java
	services/java/com/android/server/am/BroadcastQueue.java
	services/java/com/android/server/pm/PackageManagerService.java
	services/java/com/android/server/pm/PackageSettingBase.java
	test-runner/src/android/test/mock/MockContext.java
	test-runner/src/android/test/mock/MockPackageManager.java
Privacy Guard : Reimplement backed by AppOps

Re-implements privacy guard to use appops.

Change-Id: I2b52e8cf0d6e126fb156f83df885b5551503cd9d

Conflicts:
	core/java/android/provider/Settings.java
	core/res/res/values/cm_strings.xml
Revert "Active display: register/unregister recievers and listeners when enabled/disabled"

This reverts commit 0661419b26177c19e2d3fd4c08d5ace080de1222.
Merge remote-tracking branch 'upstream/jb3' into jb3