Forward port circle battery.

Change-Id: I6f832e614523b5218e0314060b04c2fc28968553

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java