Suspend Actions & Wakelock Blocker [2/3]

Change-Id: I325cc96ba5fbfdcb6217a4007daa1a905ac1a219

Conflicts:
	AndroidManifest.xml
	res/values/cr_strings.xml
	res/xml/settings_headers.xml
Fix build

Change-Id: Ie5bda438c604cd0828be91ee58c0c682d36e4d7c