Bury those beans

Change-Id: I19ec61ebb2def2cf3001a580eda7a25aea2f5dd9
[1/2] Frameworks: Wakelock Blocker

Conflicts:

	core/java/android/os/IPowerManager.aidl
	core/java/android/provider/Settings.java
	services/java/com/android/server/power/PowerManagerService.java

Change-Id: Id4fd1d8da6ed40517094a5a156f7c6fea622e985

Conflicts:
	core/java/android/os/IPowerManager.aidl
	core/java/android/provider/Settings.java
Merge "Bury those beans" into kitkat
Merge remote-tracking branch 'PA-base/kitkat' into
kitkat-remix git fetch PA-settings
base: apply custom timeout upon volume dialog instantiation

The custom timeout is correctly applied at runtime, but after a reboot
the VolumePanel will revert to the default timeout, since the custom
value is not read from the config during instantiation

Change-Id: Ifa389011247adeee70ad5f3ff0b0072dd3dff02a
Merge remote-tracking branch 'upstream/kitkat-remix' into kitkat-remix