[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: I25c8f35aee0ee8f0597de438ab58f3312caaf93b