Wakelock Blocker [1/2]

Conflicts:
	services/core/java/com/android/server/power/PowerManagerService.java

Change-Id: I0263d237a0b2d265798ceb7f7672937b2f8a53db