Revert "Rename merged out of sync."

This reverts commit f9c4191.

Author: pschuh

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

@@ -8314,11 +8314,11 @@ bool SwiftASTContext::CacheUserImports(SwiftASTContext &swift_ast_context,
   llvm::SmallVector<swift::ModuleDecl::ImportedModule, 2> parsed_imports;
 
   swift::ModuleDecl::ImportFilter import_filter {
-      swift::ModuleDecl::ImportFilterKind::Private,
-      swift::ModuleDecl::ImportFilterKind::Public,
+      swift::ModuleDecl::ImportFilterKind::Exported,
+      swift::ModuleDecl::ImportFilterKind::Default,
       swift::ModuleDecl::ImportFilterKind::ImplementationOnly,
       swift::ModuleDecl::ImportFilterKind::SPIAccessControl,
-      swift::ModuleDecl::ImportFilterKind::ShadowedBySeparateOverlay
+      swift::ModuleDecl::ImportFilterKind::ShadowedByCrossImportOverlay
   };
 
   source_file.getImportedModules(parsed_imports, import_filter);