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

* commit '448af8855e304da3bd62dc50cc2d843dc51ce7de':
  Avoid a deadlock between PMS and AppOpsService