Cyanogen Circle Battery - Thanks CyanogenMod (1/2)

Original commit here:
http://review.cyanogenmod.org/#/c/24736/7

Change-Id: I596e2109ee82f6fed26432985fb89189aeae44d3

Conflicts:

	core/java/android/provider/Settings.java
	packages/SystemUI/res/layout/system_bar_notification_area.xml