Revert "status bar: native battery percentage"

This reverts commit 3ce8f835faaf0f28ffa325694b8c4d8843708edd.

Conflicts:
	core/java/android/provider/Settings.java
status bar: battery level text

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.

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
fix
Merge branch 'lollipop' of https://github.com/ProjectDISCO/android_frameworks_base into caf