Revert "Add battery level text to status bar (1/2) NEW PATCHSET 3"

This reverts commit eaabc3d7a89e555c862f0ad2b64e61c729bc57ee.
Revert "Add battery level text to status bar (1/2)"

This reverts commit 66a64c0725724e37844634947e14356ef1d0b1c2.
Add battery level text to status bar (1/2)

1. Add TextView to display battery level percentage next to the battery
icon.
2. Remove support for displaying battery percentage on the actual
battery icon itself.
3. Also respect view on lockscreen and opened notification drawer.

Change-Id: Iab6228f5316908961c8647773bd3c8655df29679

Conflicts:
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
remove double