Revert "systemui: Add text plain battery style"

This reverts commit a6dab51d864cbf23a81cf3fcfb0ba3ee391533a2.

Conflicts:
	core/java/android/provider/Settings.java
Revert "Fix charging indication."

This reverts commit 5d3fe36b5f661e3c0b5973f3ea875297a26a9c1f.

Conflicts:
	packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
Revert "systemui: Use the same color for circle battery than clock color"

This reverts commit 39c8d1565dce9b902ebd226ff4cd544c89c23553.
Revert "systemui: fix circle battery percentage alignment for low dpi devices"

This reverts commit 624d877d751edd2a022fefb9b708887e881f8aa8.
Revert "systemui: Fix hidden battery icon style"

This reverts commit e0e8d6be9ead1bceca36d26682e9cc5d766df29b.
Revert "base: Add dock battery support"

This reverts commit fafcb823ab8bc111e72ed108259ba8aa85dee4f0.

Conflicts:
	core/java/android/app/ContextImpl.java
	core/java/android/app/IBatteryService.aidl
	core/java/android/content/Context.java
	core/java/android/os/BatteryManager.java
	core/java/android/os/BatteryProperties.java
	core/java/android/provider/Settings.java
	core/res/res/values/cm_strings.xml
	packages/SystemUI/res/layout/quick_settings_tile_dock_battery.xml
	packages/SystemUI/res/values/cm_arrays.xml
	packages/SystemUI/res/values/cm_strings.xml
	packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
	packages/SystemUI/src/com/android/systemui/DockBatteryMeterView.java
	packages/SystemUI/src/com/android/systemui/quicksettings/BatteryTile.java
	packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java
	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java
	services/java/com/android/server/am/BatteryStatsService.java
Revert "Battery icon tweaks."

This reverts commit d8595fd8feca567d48c4e271070a75c576a7dfbf.

Conflicts:
	packages/SystemUI/res/layout/status_bar.xml
Revert "Forward port circle battery."

This reverts commit 2903f9159e076261f1eaedd11d1dc4314dd5cee7.

Conflicts:
	packages/SystemUI/res/layout/status_bar.xml
	packages/SystemUI/res/values/styles.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarTransitions.java