Merge "Do not hold AppOpsService lock while calling DeviceConfig" into sc-dev