Forward port battery icon options [1/2]

credit CM
original commit: https://github.com/CyanogenMod/android_frameworks_base/commit/0e31558822b1920ad39e4ba87f813b0bf823a61e