Revert "Settings: Add option to always show battery status on lockscreen (2/2)"

This reverts commit c822768affc4b3e26958cf1229d225d738b0b98a.

Conflicts:
	res/values/cm_arrays.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java