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

Conflicts:

	res/values/cr_strings.xml

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

Conflicts:
	res/values/pixel_strings.xml
	res/xml/security_settings_chooser.xml
	src/com/android/settings/SecuritySettings.java
Settings: follow kitkat's ui

- manage apps; tab selector and ram usage
- battery data usage bar
- app widget toggle

Change-Id: I804b4b47563545d7ab124f4cc4800ef4034bf754

Conflicts:

	res/values/colors.xml

Conflicts:
	src/com/android/settings/applications/LinearColorBar.java