Merge branch 'main' into bq-expose-statement-type

Author: keshavdandeva

java-pubsub/google-cloud-pubsub/src/test/java/com/google/cloud/pubsub/v1/StreamingSubscriberConnectionTest.java

@@ -164,6 +164,7 @@ public void testRunShutdown_TimeoutMet() throws Exception {
     streamingSubscriberConnection.awaitTerminated(1, TimeUnit.SECONDS);
   }
 
+  @Ignore("https://github.com/googleapis/google-cloud-java/issues/13706")
   @Test
   public void testRunShutdown_TimeoutExceeded() throws Exception {
     final SettableApiFuture<com.google.protobuf.Empty> ackFuture = SettableApiFuture.create();
@@ -548,7 +549,6 @@ public void testSendAckOperationsExactlyOnceEnabledMessageFuturesAcks() {
     }
   }
 
-  @Ignore("https://github.com/googleapis/google-cloud-java/issues/13706")
   @Test
   public void testSendAckOperationsExactlyOnceEnabledErrorWithEmptyMetadataMap() {
     // Setup