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

This reverts commit 4d95e66b51f0313b4516fed296f1d422f031106d.

Conflicts:

	core/java/android/provider/Settings.java