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