[1/2] settings: Enable quick unlock

Conflicts:
	res/values/mahdi_strings.xml
	src/com/android/settings/SecuritySettings.java

Conflicts:
	res/values/ras_strings.xml
	src/com/android/settings/SecuritySettings.java