Forward port battery icon option [2/2]

Bring forward the various battery icon options.

Still retains new options for where to show battery percentage text.

Screw'd:
Augmented for Screw'd AOSP

This also kinda reverts this: https://github.com/MrApocalypse/packages_apps_Settings/commit/0fae4ee5d3796c5d808c07064dba3fc473ffddb3

This just removes the preference from StatusBar settings and moves it to it's
rightful place

Change-Id: I75b3d9f4ba4b4206d2be5f2cd24ceceeae3234fc