Merge "SystemUI: Allow theming battery via theme chooser" into cm-11.0

(cherry picked from commit d426af35a2ab84278d5e9345759a7544e3c20200)

Conflicts:
	packages/SystemUI/res/values/colors.xml