Merge "Privacy Guard : Reimplement backed by AppOps" into cm-10.2