Wakelock Blocker [1/2]

Conflicts:
	core/java/android/os/IPowerManager.aidl