Revert "Fix: Battery Status Icons"

This reverts commit a89088dad77474744fd780a672d9c95f8e3458ba.

Conflicts:
	packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
Revert " Battery status icon tweaks"

This reverts commit 56ab7fd8a592a280d25046849838bad90808821b.

Conflicts:
	packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
Remove clock and overscroll color options

Also some code update from Omni