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

Change-Id: I68a9c4d7c8a49ec0568e8712e7f89d4114ae847a

Conflicts:
	res/values/cm_strings.xml
	src/com/android/settings/SecuritySettings.java
Revert "[2/2] Settings: Add lockscreen ring battery setting"

This reverts commit 84a3c42f7f2951b44eb88c012f7e4c47705d7734.