[2/2] Settings: Wakelock Blocker

Change-Id: I107bec97fd759b9b85ee241628f9a35e022a22c7

Conflicts:
	res/values/custom_strings.xml
	res/xml/more_device_settings.xml

Conflicts:
	res/values/pa_strings.xml
	res/xml/additional_settings.xml
 Lockscreen notifications: add dependency to color option
Revert "[2/2] Settings: Wakelock Blocker"

This reverts commit 4783259aac14e4473d39a7f81e1dfbd155a43b0f.