Fix merge conflicts.

Author: kannanjgithub

netty/src/main/java/io/grpc/netty/ProtocolNegotiators.java

@@ -83,7 +83,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Executor;
 import java.util.logging.Level;

netty/src/test/java/io/grpc/netty/NettyClientTransportTest.java

@@ -967,7 +967,7 @@ private ProtocolNegotiator newNegotiator() throws IOException, GeneralSecurityEx
             TlsTesting.loadCert("ca.pem")).get());
   }
 
-  private static Optional<TrustManager> getX509ExtendedTrustManager(InputStream rootCerts)
+  private static java.util.Optional<TrustManager> getX509ExtendedTrustManager(InputStream rootCerts)
       throws GeneralSecurityException {
     KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
     try {

netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java

@@ -1034,7 +1034,7 @@ public void clientTlsHandler_closeDuringNegotiation() throws Exception {
   private ClientTlsProtocolNegotiator getClientTlsProtocolNegotiator() throws SSLException {
     return new ClientTlsProtocolNegotiator(GrpcSslContexts.forClient().trustManager(
         TlsTesting.loadCert("ca.pem")).build(),
-        null, Optional.empty(), null);
+        null, Optional.absent(), null);
   }
 
   @Test
@@ -1043,7 +1043,7 @@ public void allowedAuthoritiesForTransport_LruCache() throws SSLException, Certi
     ClientTlsProtocolNegotiator negotiator = new ClientTlsProtocolNegotiator(
         GrpcSslContexts.forClient().trustManager(
             TlsTesting.loadCert("ca.pem")).build(),
-        null, Optional.empty(), mockX509ExtendedTrustManager);
+        null, Optional.absent(), mockX509ExtendedTrustManager);
     SSLEngine mockSslEngine = mock(SSLEngine.class);
     negotiator.setSslEngine(mockSslEngine);
     SSLSession mockSslSession = mock(SSLSession.class);