Wakelock Blocker [1/2]

Change-Id: Id4fd1d8da6ed40517094a5a156f7c6fea622e985

Conflicts:

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