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

Change-Id: I68a9c4d7c8a49ec0568e8712e7f89d4114ae847a

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