Settings: Wakelock Blocker (2/2)

Conflicts:
	res/values/ras_strings.xml
	res/xml/lichti_tweaks.xml

Conflicts:
	res/values/ras_strings.xml
	res/xml/system_settings.xml

Change-Id: I693e3189d103b7546e333a3b02891e0cefa1e737