[2/2] Settings: Wakelock Blocker

Change-Id: I107bec97fd759b9b85ee241628f9a35e022a22c7

Conflicts:
	AndroidManifest.xml
	res/values/custom_strings.xml
	res/xml/settings_headers.xml