Merge branch 'master' into dconeybe/ImproveMissingIndexTestName

Author: dconeybe

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/AggregationTest.java

@@ -903,14 +903,15 @@ public void testAggregateErrorMessageShouldContainConsoleLinkIfMissingIndex() {
     Throwable throwable = assertThrows(Throwable.class, () -> waitFor(task));
 
     Throwable cause = throwable.getCause();
+    Truth.assertThat(cause).hasMessageThat().ignoringCase().contains("index");
+    // TODO(b/316359394) Remove this check for the default databases once cl/582465034 is rolled
+    // out to production.
     if (collection
         .firestore
         .getDatabaseId()
         .getDatabaseId()
         .equals(DatabaseId.DEFAULT_DATABASE_ID)) {
       Truth.assertThat(cause).hasMessageThat().contains("https://console.firebase.google.com");
-    } else {
-      Truth.assertThat(cause).hasMessageThat().contains("Missing index configuration");
     }
   }
 

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CountTest.java

@@ -277,14 +277,14 @@ public void testCountErrorMessageShouldContainConsoleLinkIfMissingIndex() {
 
     Throwable cause = throwable.getCause();
     assertThat(cause).hasMessageThat().ignoringCase().contains("index");
+    // TODO(b/316359394) Remove this check for the default databases once cl/582465034 is rolled
+    // out to production.
     if (collection
         .firestore
         .getDatabaseId()
         .getDatabaseId()
         .equals(DatabaseId.DEFAULT_DATABASE_ID)) {
       assertThat(cause).hasMessageThat().contains("https://console.firebase.google.com");
-    } else {
-      assertThat(cause).hasMessageThat().contains("Missing index configuration");
     }
   }
 }