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

This reverts commit 2f04b6f82d016e961d4624d61ebc3288bc07e638.

Conflicts:
	res/values/pa_strings.xml
	src/com/android/settings/AOSPAL/LockscreenSettings.java
Merge branch 'kitkat-remix' of github.com:AOSPAL/android_packages_apps_Settings into kitkat-remix