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

Not useful

This reverts commit ad267979293e1177df1841a41d01abcba15fd075.

Conflicts:
	core/java/android/provider/Settings.java