Merge "Migrate PermissionState and AppOps tests to new owners"