Sync eng/common/{cross,native} with arcade#5892

am11 wants to merge 2 commits into

dotnet:maindotnet/diagnostics:mainfrom

am11:chore/sync-eng-commonam11/diagnostics:chore/sync-eng-commonCopy head branch name to clipboard