Make Privacy Guard a first class citizen in the Settings app.

Change-Id: Ie45e21cfa5190307923edf65f8ff5356fa305d70
Settings: Add option to always show battery status on lockscreen (2/2)

Based on the feature by burnsra in CM7
Authored by blunden
Tweaked by dvtonder
Change-Id: I1c8c8eef3d0c913c621f735e7d5e395c8768fe76

lockscreen battery status: add off option (1/2)
Change-Id: I06dd1b81826bdb1c1e35b72d99970f97dcad1a34

Conflicts:

	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java