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

Based on the feature by burnsra in CM7

Authored by blunden
Tweaked  by dvtonder
Tweaked  by kufikugel

PS 4 : Fix multi-user

Change-Id: I834dd4c7e742c1f0537773c0af6b6ece5b1c306d

Conflicts:
	src/com/android/settings/SecuritySettings.java