Settings: Add cLock settings back to lockscreen settings

Change-Id: I00153e63e39e312b5ff097a4e651f2bbf33d7b4b

Conflicts:
	res/values/cm_strings.xml
	res/xml/lockscreen_interface_settings.xml