Merge "Revert "contacts: Privacy Guard support"" into cm-10.2