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
QuickSettings : Quick Collapse [2/2]

Credits: Danesh M

Change-Id: Idc535b4b65523d71b7fd1e1ff1229a0ec85f7414

Conflicts:
	res/values/slim_strings.xml
	res/xml/notification_drawer_qs_settings.xml