Merge "Expand try/catch for DeviceConfig in AppOpsManager" into sc-dev