Frameworks: Wakelock Blocker (1/2)

Conflicts:

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

Change-Id: Id4fd1d8da6ed40517094a5a156f7c6fea622e985
Frameworks: Volume panel timeout (1/2)

Change-Id: Iba6cca4afd5cc1ed81ada2564f03360345fbdd6c