Merge "Fix FsVerityTestApp with AdoptShellPermissionsRule" into main