Fix flakyness of testTwoBadUrl

Author: shivaspeaks

cronet/build.gradle

@@ -58,7 +58,7 @@ dependencies {
 
 task javadocs(type: Javadoc) {
     source = android.sourceSets.main.java.srcDirs
-    // classpath += files(android.getBootClasspath())
+    classpath += files(android.getBootClasspath())
     classpath += files({
         android.libraryVariants.collect { variant ->
             variant.javaCompileProvider.get().classpath

xds/src/main/java/io/grpc/xds/client/XdsClientImpl.java

@@ -1028,7 +1028,11 @@ public void handleStreamClosed(Status status, boolean shouldTryFallback) {
       for (Map<String, ResourceSubscriber<? extends ResourceUpdate>> subscriberMap :
           resourceSubscribers.values()) {
         for (ResourceSubscriber<? extends ResourceUpdate> subscriber : subscriberMap.values()) {
-          if (subscriber.hasResult() || !authoritiesForClosedCpc.contains(subscriber.authority)) {
+          if (!authoritiesForClosedCpc.contains(subscriber.authority)) {
+            continue;
+          }
+          // If subscriber already has data, this is an ambient error.
+          if (subscriber.hasResult()) {
             subscriber.onError(status, null);
             continue;
           }