Cleanup battery style code

Change-Id: Ic56878c26e9a3416149eaaa8a9325d56d664e22e

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Notifications: Material (dark) theme

Conflicts:
	packages/SystemUI/res/layout/notification_guts.xml