[1/2] Frameworks: Wakelock Blocker

Change-Id: Id4fd1d8da6ed40517094a5a156f7c6fea622e985

Conflicts:

	core/java/android/provider/Settings.java