Revert [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 (reverted from commit 6aeaf384e67af01b06ad3e9f3a5000af89e9d35c)