Revert "[2/2] Add battery level around unlock ring"

This reverts commit 6711bbe1b38dbda260233bd52940fd66fafc6f49.

Conflicts:
	res/values/ca_strings.xml
[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/xml/security_settings_chooser.xml
	src/com/android/settings/SecuritySettings.java