Merge "Intern package names in AppOpsService" into main