Merge "Removed AppOps test as it is part of PermissionService now" into main