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

Change-Id: Ie45e21cfa5190307923edf65f8ff5356fa305d70

Conflicts:

	res/xml/settings_headers.xml