[2/2] Settings: Make the lock screen camera widget configurable

Change-Id: I704ddeb4a1b8ba4537d961334138b6661f8dbc31

Conflicts:
	res/values/cm_strings.xml
	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java