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

This reverts commit 9537714a17eba1b43df199d59894fa95ef39bcd6.