Settings: Fix Lock screen Battery status summary display

Change-Id: I848751b4db2d55f156c2e256756ed749d8b512fb

Conflicts:
	src/com/android/settings/cyanogenmod/LockscreenInterface.java