Merge "[DeviceAware] Inline some calls to AppOpsCheckingService and remove some methods from AppOpsService.Op and AppOpsService.UidState" into main