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

This reverts commit 6b5498fed7eb590df5de3b43da6969ae1cc230d9.

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