Revert "comment this out while i figure out why it breaks build"

This reverts commit 9110a2359798aa91c4911ec14d8ed748a3892023.
Revert "Frameworks: privacy guard fix UI freeze"

This reverts commit 6c255dad4b112caf90c84632424710cca5fa107e.
Revert "Frameworks: privacy guard fix possible NPE"

This reverts commit ccc4151459230183b7ff7e230020c733bc952a58.
Revert "am: Fix the privacy guard notification"

This reverts commit 876e7748f7d355555c2591e1d0168600cb874b46.
Revert "privacy guard: Use LocationBlacklist for location filtering"

This reverts commit cae840b0f3a1ec4544aaf575be6ffbe1e5eb045e.
Revert "framework: Privacy Guard"

This reverts commit 278c1b8825714a3cd75f97c8f37142581c0d6d9a.

Conflicts:
	core/res/AndroidManifest.xml
	core/res/res/values/demented_strings.xml
	test-runner/src/android/test/mock/MockPackageManager.java
Revert "Add missing @hide annotations for Privacy Guard"

This reverts commit 204d5665a3857f1370ef5feb26d92ffd73d19027.

Conflicts:
	core/res/AndroidManifest.xml
	test-runner/src/android/test/mock/MockPackageManager.java
un needed }
Frameworks: Breathing MMs and Missed Call notifications

Conflicts:
	core/java/android/provider/Settings.java
TEMPORARY: Reintroduce button-backlight (and respective inactivity timeout)

The power manager rewrite from Change I1d7a52e98f0449f76d70bf421f6a7f245957d1d7
completely removed support for control of the button backlights, which makes
all capacitive buttons out there stay dark. The commit message in that change
mentions it hasn't been implemented _yet_, so this fix should be temporary
until upstream does their own implementation

Change-Id: I6094c446e0b8c23f57d30652a3cbd35dee5e821a