Revert "Return: Always show battery on Keyguard [2/2]"

This reverts commit 2f04b6f82d016e961d4624d61ebc3288bc07e638.

Conflicts:
	res/values/pa_strings.xml
	res/xml/lockscreen_settings.xml
	src/com/android/settings/AOSPAL/LockscreenSettings.java