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

* commit '5a18b4bfe2cf30df2e18047c155fecc6433ed52c':
  Avoid a deadlock between PMS and AppOpsService