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