Wakelock Blocker [2/2]

Change-Id: I107bec97fd759b9b85ee241628f9a35e022a22c7

Conflicts:

	res/xml/slim_interface_settings.xml

Conflicts:
	res/values/hyperion_strings.xml
	res/xml/hyperion_interface_settings.xml
add missed cherry-pick file for wakelock blocker