[TestOnly] port test fixes#89065

stephentoub merged 1 commit intodotnet:release/7.0-stagingdotnet/runtime:release/7.0-stagingfrom

tarekgh:release/7.0-stagingtarekgh/runtime:release/7.0-stagingCopy head branch name to clipboard