Settings: Add cLock settings to custom settings

Conflicts:
	res/values/custom_strings.xml
	res/xml/custom_settings.xml
	src/com/android/settings/euphoria/CustomSettings.java