[1/2] Frameworks: Wakelock Blocker

Change-Id: Id4fd1d8da6ed40517094a5a156f7c6fea622e985

Conflicts:
	services/java/com/android/server/power/PowerManagerService.java
[1/2] Base: Volume panel timeout

Change-Id: Iba6cca4afd5cc1ed81ada2564f03360345fbdd6c