Cleanup battery style code

* Cleanup commented out code
* Fix landscape battery icon padding
* Fix landscape battery icon charging indicator
* Fix circle battery frame color on some black backgrounds
* Fix percentage not shown while charging

TODO:
* Fix landscape battery icon percentage indicator
* Fix circle battery artifact on low percentage

Change-Id: Ic56878c26e9a3416149eaaa8a9325d56d664e22e
HeadsUp: fix headsup for incoming calls