[2/2] Settings: Battery Icons

      Reveal hidden battery option

Change-Id: I256a7e52e40b9e581bd85cb5996070f0488d95a6
Merge "[2/2] Settings: Battery Icons" into kitkat
Merge remote-tracking branch 'PA/kitkat' into remix-staging