[2/2] Settings: Add lockscreen ring battery setting
Change-Id: Ia07ecc1feedee71b8ea217c53244fdef9ff1bc18

Conflicts:
	res/values/cr_strings.xml
	src/com/android/settings/SecuritySettings.java
Merge branch 'kk4.4' of https://github.com/SlimRoms/packages_apps_Settings into temp

Conflicts:
	res/values/slim_arrays.xml

Change-Id: Ie76365e3ce23dfb9669292a3b918883cac05a1d4
Derp

Change-Id: I22766f04de453232771b835d2463c9884d9f259c
Merge branch 'temp' into kk4.4

Conflicts:
	res/values/sl_arrays.xml

Change-Id: Icdbbe2efbabbb439987b36790c3da0aa5c827a50