SystemUI: Add statusbar battery text only
Merge branch 'AOSPZ/master'

Conflicts:
	core/java/android/provider/Settings.java