Revert "fb: add Battery Styles the new way 1/2"

This reverts commit f552e3a45d98d3dc5a6d8a5af99874b70787f18e.

Conflicts:
	core/java/android/provider/Settings.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java