PAC: Fix Battery icons

Conflicts:

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

Change-Id: I98cca137454c8c7581c8c60a920a496d9849c9fe