Merge "Make Privacy Guard a first class citizen in the Settings app." into cm-11.0

Signed-off-by: scott <scott@ubuntu>

Conflicts:
	res/xml/settings_headers.xml

Change-Id: I2f7446bb0858f65434d23f1c641943ea5fda0cfa