Merge branch 'main' into rl.ig.forma

Author: rlazo

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

@@ -363,7 +363,7 @@ public void testPOJOWithWrongType() {
     } catch (IllegalArgumentException e) {
       assertEquals(
           "Field timestamp is annotated with @ServerTimestamp but is class "
-              + "java.lang.String instead of Date or Timestamp.",
+              + "java.lang.String instead of Date, Timestamp, or Instant.",
           e.getMessage());
     }
   }