add verifySameChannelId back and fix partitionDML test

Author: rahul2393

google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java

@@ -478,7 +478,8 @@ public GapicSpannerRpc(final SpannerOptions options) {
                   .withCheckInterval(pdmlSettings.getStreamWatchdogCheckInterval()));
         }
         this.partitionedDmlStub =
-            GrpcSpannerStubWithStubSettingsAndClientContext.create(pdmlSettings.build());
+            GrpcSpannerStubWithStubSettingsAndClientContext.create(
+                pdmlSettings.build(), clientContext);
         this.instanceAdminStubSettings =
             options.getInstanceAdminStubSettings().toBuilder()
                 .setTransportChannelProvider(channelProvider)

google-cloud-spanner/src/test/java/com/google/cloud/spanner/RequestIdMockServerTest.java

@@ -533,7 +533,7 @@ public void testPartitionedDml() {
             XGoogSpannerRequestId.of(getClientId(), -1, 1, 1),
             XGoogSpannerRequestId.of(getClientId(), -1, 2, 1)),
         actual);
-    // Channel ID is determined by grpc-gcp, so we don't verify same channel ID here.
+    verifySameChannelId(actual);
   }
 
   @Test
@@ -559,7 +559,7 @@ public void testPartitionedDmlError() {
             XGoogSpannerRequestId.of(getClientId(), -1, 1, 1),
             XGoogSpannerRequestId.of(getClientId(), -1, 2, 1)),
         actual);
-    // Channel ID is determined by grpc-gcp, so we don't verify same channel ID here.
+    verifySameChannelId(actual);
     assertEquals(XGoogSpannerRequestId.of(exception.getRequestId()), actual.get(1));
   }
 
@@ -586,7 +586,7 @@ public void testPartitionedDmlAborted() {
             XGoogSpannerRequestId.of(getClientId(), -1, 3, 1),
             XGoogSpannerRequestId.of(getClientId(), -1, 4, 1)),
         actual);
-    // Channel ID is determined by grpc-gcp, so we don't verify same channel ID here.
+    verifySameChannelId(actual);
   }
 
   @Test
@@ -612,7 +612,7 @@ public void testPartitionedDmlUnavailable() {
             XGoogSpannerRequestId.of(getClientId(), -1, 3, 1),
             XGoogSpannerRequestId.of(getClientId(), -1, 4, 1)),
         actual);
-    // Channel ID is determined by grpc-gcp, so we don't verify same channel ID here.
+    verifySameChannelId(actual);
   }
 
   @Test
@@ -648,7 +648,7 @@ public void testPartitionedDmlUnavailableWithResumeToken() {
             XGoogSpannerRequestId.of(getClientId(), -1, 2, 1),
             XGoogSpannerRequestId.of(getClientId(), -1, 2, 2)),
         actual);
-    // Channel ID is determined by grpc-gcp, so we don't verify same channel ID here.
+    verifySameChannelId(actual);
   }
 
   @Test