[2/2] Privacy Guard options

Conflicts:
	res/values/mahdi_strings.xml

Change-Id: I1592e11a10b4888578b7af50cbccfad208365989
Merge branch 'kk44' of https://github.com/wSedlacek/packages_apps_Settings into kk44