Clean up and re-enable OR query integration tests.

Author: ehsannas

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

@@ -1432,31 +1432,6 @@ public void testOrQueriesWithIn() {
         "doc6");
   }
 
-  @Test
-  public void testOrQueriesWithNotIn() {
-    assumeTrue(
-        "Skip this test if running against production because it results in a "
-            + "'missing index' error. The Firestore Emulator, however, does serve these "
-            + " queries",
-        isRunningAgainstEmulator());
-    Map<String, Map<String, Object>> testDocs =
-        map(
-            "doc1", map("a", 1, "b", 0),
-            "doc2", map("b", 1),
-            "doc3", map("a", 3, "b", 2),
-            "doc4", map("a", 1, "b", 3),
-            "doc5", map("a", 1),
-            "doc6", map("a", 2));
-    CollectionReference collection = testCollectionWithDocs(testDocs);
-
-    // a==2 || b not-in [2,3]
-    // Has implicit orderBy b.
-    checkOnlineAndOfflineResultsMatch(
-        collection.where(Filter.or(Filter.equalTo("a", 2), Filter.notInArray("b", asList(2, 3)))),
-        "doc1",
-        "doc2");
-  }
-
   @Test
   public void testOrQueriesWithArrayMembership() {
     Map<String, Map<String, Object>> testDocs =
@@ -1487,10 +1462,6 @@ public void testOrQueriesWithArrayMembership() {
 
   @Test
   public void testMultipleInOps() {
-    // TODO(orquery): Enable this test against production when possible.
-    assumeTrue(
-        "Skip this test if running against production because it's not yet supported.",
-        isRunningAgainstEmulator());
     Map<String, Map<String, Object>> testDocs =
         map(
             "doc1", map("a", 1, "b", 0),
@@ -1517,10 +1488,6 @@ public void testMultipleInOps() {
 
   @Test
   public void testUsingInWithArrayContainsAny() {
-    // TODO(orquery): Enable this test against production when possible.
-    assumeTrue(
-        "Skip this test if running against production because it's not yet supported.",
-        isRunningAgainstEmulator());
     Map<String, Map<String, Object>> testDocs =
         map(
             "doc1", map("a", 1, "b", asList(0)),
@@ -1584,11 +1551,6 @@ public void testUsingInWithArrayContains() {
 
   @Test
   public void testOrderByEquality() {
-    // TODO(orquery): Enable this test against production when possible.
-    assumeTrue(
-        "Skip this test if running against production because order-by-equality is "
-            + "not supported yet.",
-        isRunningAgainstEmulator());
     Map<String, Map<String, Object>> testDocs =
         map(
             "doc1", map("a", 1, "b", asList(0)),