Allow toggling of status_bar_show_battery_percentage [2/2]

Change-Id: I72c946bde0bc2a4643b1ccd505aa76e89b051a7a

Conflicts:
	res/values/vendor_arrays.xml
	res/values/vendor_strings.xml
	res/xml/status_bar.xml
	src/com/android/settings/chameleonos/StatusBar.java