Settings: 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.

Change-Id: I75b3d9f4ba4b4206d2be5f2cd24ceceeae3234fc

From here: https://github.com/CyanogenMod/android_packages_apps_Settings/commit/ba62228d9283225993b57b2f17392b8c7d706561