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

Based on the feature by burnsra in CM7

Authored by Blunden
Tweaked by DvTonder
Tweaked by kufikugel

PS 6 : Fix multi-user

Change-Id: I02cc3a0d996ca1fb3c96c6847865655be5518434

Conflicts:

	core/java/android/provider/Settings.java

Conflicts:
	core/java/android/provider/Settings.java
	packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java