chore: merge main into generate-libraries-main

Author: cloud-java-bot

pom.xml

@@ -263,15 +263,11 @@
 
                         <!-- Hide @InternalApi classes for InstanceAdmin -->
                         <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/internal/**</sourceFileExclude>
-                        <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClient.java</sourceFileExclude>
-                        <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminSettings.java</sourceFileExclude>
                         <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminCallableFactory.java</sourceFileExclude>
                         <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableInstanceAdminStub.java</sourceFileExclude>
                         <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/stub/BigtableInstanceAdminStub.java</sourceFileExclude>
 
                         <!-- Hide**/ @InternalApi classes for TableAdmin -->
-                        <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClient.java</sourceFileExclude>
-                        <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminSettings.java</sourceFileExclude>
                         <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminCallableFactory.java</sourceFileExclude>
                         <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/stub/GrpcBigtableTableAdminStub.java</sourceFileExclude>
                         <sourceFileExclude>**/com/google/cloud/bigtable/admin/v2/stub/BigtableTableAdminStub.java</sourceFileExclude>
@@ -331,7 +327,7 @@
                                 <!-- Exclude generating javadocs for internal implementations for admin and data, which
                                  are under internal/ and .v2.stub/, and exclude all BaseClients and BaseSettings.
                                  The only exception is we want to keep the javadoc for StubSettings. -->
-                                -excludeclasses com\.google\.cloud\.bigtable\.admin\.v2\.(internal\.|(Base.*).*|stub\.(?!Bigtable.*StubSettings).*):com\.google\.cloud\.bigtable\.data\.v2\.(internal\.|(Base.*).*|stub\.(?!Enhanced.*StubSettings).*)
+                                -excludeclasses com\.google\.cloud\.bigtable\.admin\.v2\.(internal\.|stub\.(?!Bigtable.*StubSettings).*):com\.google\.cloud\.bigtable\.data\.v2\.(internal\.|(Base.*).*|stub\.(?!Enhanced.*StubSettings).*)
                                 <!-- Exclude the javadocs for the auto-generated raw protos since we don't expose them.
                                  The raw protos generated by gapic are under com.google.bigtable. And the public surface
                                  is under com.google.cloud.bigtable. Also exclude the stats package which is the