Merge fixes

Author: kannanjgithub

s2a/src/main/java/io/grpc/s2a/internal/handshaker/S2AProtocolNegotiatorFactory.java

@@ -259,7 +259,8 @@ public void onSuccess(SslContext sslContext) {
                             public void run() {
                               s2aStub.close();
                             }
-                          }))
+                          }),
+                          null)
                       .newHandler(grpcHandler);
 
               // Delegate the rest of the handshake to the TLS handler. and remove the 

xds/src/main/java/io/grpc/xds/internal/security/SslContextProviderSupplier.java

@@ -68,7 +68,7 @@ public synchronized void updateSslContext(final SslContextProvider.Callback call
       }
 
       // we want to increment the ref-count so call findOrCreate again...
-      final SslContextProvider toRelease = getSslContextProvider();
+      final SslContextProvider toRelease = getSslContextProvider(sni);
       // When using system root certs on client side, SslContext updates via CertificateProvider is
       // only required if Mtls is also enabled, i.e. tlsContext has a cert provider instance.
       if (tlsContext instanceof UpstreamTlsContext
@@ -77,7 +77,7 @@ public synchronized void updateSslContext(final SslContextProvider.Callback call
         callback.getExecutor().execute(() -> {
           try {
             callback.updateSslContext(GrpcSslContexts.forClient().build());
-            releaseSslContextProvider(toRelease);
+            releaseSslContextProvider(toRelease, sni);
           } catch (SSLException e) {
             callback.onException(e);
           }
@@ -89,13 +89,13 @@ public synchronized void updateSslContext(final SslContextProvider.Callback call
               @Override
               public void updateSslContext(SslContext sslContext) {
                 callback.updateSslContext(sslContext);
-                releaseSslContextProvider(toRelease);
+                releaseSslContextProvider(toRelease, sni);
               }
 
               @Override
               public void onException(Throwable throwable) {
                 callback.onException(throwable);
-                releaseSslContextProvider(toRelease);
+                releaseSslContextProvider(toRelease, sni);
               }
             });
       }