Port forward: Battery types, Cog circle battery updates

SystemUI: Cog Circle Mod Battery
--kwes1020

SystemUI: Battery Styles
--syaoran12 (aka adamthecashew)

Change-Id: I25c4c27be70048b5c44e7c645c25487cbf602aaf

Conflicts:

	core/java/android/provider/Settings.java

Signed-off-by: iceandfire <arhamjamal@gmail.com>