Suspend Actions & Wakelock Blocker…

… [1/3] [log]

Change-Id: Ie63551e0e6f1a1ee5c2e16da441076557512936a

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