[WIP] Cleanup battery style code (Updated to PS6)

* 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
* Fix landscape battery icon percentage indicator
* Fix circle battery artifact on low percentage
Change-Id: Ic56878c26e9a3416149eaaa8a9325d56d664e22e