SysUI: Battery: properly fix color settings

* Frame isn't black in first boot or the color is resetted
* User don't have to set battery color to make system color work in another variable

Change-Id: I50fb346256c006315c3dd455ed3c53050eb122c1

Conflicts:
	packages/SystemUI/src/com/android/systemui/BatteryMeterView.java