Revert " Battery status icon tweaks"

This reverts commit 03513bd250a1afa88878d83a8c9468832d0cac94.
Revert "[1/2] Frameworks: Optional statusbar battery icons"

This reverts commit 722e38456ade478e93e9f0ab7d572e17e8e2f250.