AppOps/Privacy Guard: Fix up misaligned switches.

Change-Id: Ic9e1e09ac911e552599f7bca6fb71b2808548f1d
Make Privacy Guard a first class citizen in the Settings app.

Change-Id: Ie45e21cfa5190307923edf65f8ff5356fa305d70

Conflicts:
	res/xml/settings_headers.xml