Changes in circle battery implementation to fit HALO

Change-Id: Ib8848537586511c509655776f74ea452f7b7e1ac

Conflicts:

	packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java