Leave TARGET_SERVICE_INFO for a follow up

Author: jdcormie

binder/src/main/java/io/grpc/binder/ApiConstants.java

@@ -45,11 +45,4 @@ private ApiConstants() {}
    */
   public static final NameResolver.Args.Key<UserHandle> TARGET_ANDROID_USER =
       NameResolver.Args.Key.create("target-android-user");
-
-  /**
-   * The authentic ServiceInfo for an {@link io.grpc.EquivalentAddressGroup} of {@link
-   * AndroidComponentAddress}es, in case a {@link NameResolver} has already looked it up.
-   */
-  public static final Attributes.Key<ServiceInfo> TARGET_SERVICE_INFO =
-      Attributes.Key.create("target-service-info");
 }

binder/src/main/java/io/grpc/binder/internal/BinderTransport.java

@@ -670,19 +670,15 @@ public synchronized Runnable start(ManagedClientTransport.Listener clientTranspo
 
     @GuardedBy("this")
     private void preAuthorizeServer() {
-      Attributes eagAttrs = checkNotNull(attributes.get(GrpcAttributes.ATTR_CLIENT_EAG_ATTRS));
-      ServiceInfo serviceInfo = eagAttrs.get(ApiConstants.TARGET_SERVICE_INFO);
-      if (serviceInfo == null) {
-        serviceInfo = serviceBinding.resolve();
-      }
+      ServiceInfo serviceInfo = serviceBinding.resolve();
 
       // It's unlikely, but in theory the server identity/existence represented by this ServiceInfo
       // could change by the time we actually bind/connect. It doesn't matter though, because:
       // - If pre-auth fails (but would succeed for the new identity), grpc-core will retry
       // against the replacement server using a new instance of BinderClientTransport.
       // - If pre-auth succeeds (but would fail for the new identity), we might incorrectly bind
-      // to an unauthorized server, but we'll check the SecurityPolicy again in SETUP_TRANSPORT
-      // against the actual/new server's identity.
+      // to an unauthorized server, but we'll notice when we the SecurityPolicy again as part of the
+      // usual handshake.
       if (serviceInfo == null) {
         preAuthResultFuture =
             Futures.immediateFuture(