am b3e40760: Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev

* commit 'b3e407609f567884f9322e7b34461baa14e3f3ae':
  Avoid a deadlock between PMS and AppOpsService