[2/2] Settings: Add lockscreen ring battery setting

Change-Id: Ia07ecc1feedee71b8ea217c53244fdef9ff1bc18

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

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