[1/2] Frameworks: Battery Icons

      Reveal hidden battery option
      Remove all customizations; return to stock design

PS2 - made font black and bold

Change-Id: I026daf0e2b75c8cf9923ed28ef02289813cfdb50
Fix possible NPE

Fix null pointer error as reported on Jira
https://paranoidandroid.atlassian.net/browse/AOSPA-218

Change-Id: I7929a518b49ba25ac97f4e184a21da427d5aa70c