Fix TabletUI battery

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java