Merge "Handle cancellation of the 'enabling PrivacyGuard' alert box." into cm-10.1

Change-Id: I835eb9cb1df13e98eff982cc972c6d57f73b5ffb