Add back privacy guard manager [2/3]

Change-Id: Ic9fbbae137bb8425fe72a6cdb2f17117351b5709

Conflicts:
	AndroidManifest.xml
	res/values/cm_strings.xml
	res/xml/security_settings_app_cyanogenmod.xml