Merge remote-tracking branch 'remotes/origin/RetryTestHelper' into BloomFilterUnicodeTest

Author: dconeybe

packages/firestore/test/integration/api/query.test.ts

@@ -26,7 +26,6 @@ import {
   Bytes,
   collection,
   collectionGroup,
-  CollectionReference,
   deleteDoc,
   disableNetwork,
   doc,
@@ -37,7 +36,6 @@ import {
   enableNetwork,
   endAt,
   endBefore,
-  Firestore,
   GeoPoint,
   getDocs,
   getDocsFromCache,