Merge remote-tracking branch 'origin/main' into manual-main-merge

Conflicts:
  - `lib/Driver/ToolChains.cpp` conflicting with the `addAllArgs` rename
    for multiple options

lib/Serialization/ModuleFile.cpp

@@ -1397,3 +1397,7 @@ StringRef SerializedASTFile::getExportedModuleName() const {
     return name;
   return FileUnit::getExportedModuleName();
 }
+
+StringRef SerializedASTFile::getPublicModuleName() const {
+  return File.getPublicModuleName();
+}