Suspend Actions & Wakelock Blocker (2/2)

Change-Id: I325cc96ba5fbfdcb6217a4007daa1a905ac1a219

Conflicts:

	AndroidManifest.xml
	res/values/cm_strings.xml
	res/xml/settings_headers.xml

(cherry picked from commit 2b7f78c02ac8ce787c561d3542ad2e0be2c6d7c1)