Merge changes from topic "SetModeNoEntanglement-qt-qpr1-dev" into qt-qpr1-dev

* changes:
  DO NOT MERGE Don't throw exception in AppOpsManager.checkOp
  DO NOT MERGE Remove unnecessary internal APIs.
  DO NOT MERGE SetMode: Don't call into PM with AppOps lock held