Settings: Fix up top level "Privacy" section

Change-Id: Id4dbda10a891c793bc6eb3c42807cc0e3f6092cc
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0-wip