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

* commit '81b5d5550c7a9705b25e455b19a90eeb151a2182':
  Avoid a deadlock between PMS and AppOpsService