[clang][modules] Cherry-picks for minor fixes#10854

cyndyishida merged 2 commits intoswiftlang:swift/release/6.2swiftlang/llvm-project:swift/release/6.2from

cyndyishida:eng/ScannerCrashcyndyishida/llvm-project:eng/ScannerCrashCopy head branch name to clipboard