Merge Android U (ab/10368041)

Bug: 291102124
Merged-In: I658ac79b7b48ad1ab4f36a56d61c16d891e1143d
Change-Id: I5c4d624cc15fc98e9ff63a6c5aab216e6c8ea4f0
diff --git a/tests/com/google/common/geometry/S2RegionCovererTest.java b/tests/com/google/common/geometry/S2RegionCovererTest.java
index 51e3de4..5ff8969 100644
--- a/tests/com/google/common/geometry/S2RegionCovererTest.java
+++ b/tests/com/google/common/geometry/S2RegionCovererTest.java
@@ -74,6 +74,9 @@
     }
   }
 
+  // b/280346791 - commented in Android as this test occasionally takes a long time, probably
+  // due to an upstream bug that generates pathological test geometry cases.
+  /*
   public void testRandomCaps() {
     logger.info("TestRandomCaps");
 
@@ -115,6 +118,7 @@
       checkCovering(coverer, cap, denormalized, false);
     }
   }
+  */
 
   public void testSimpleCoverings() {
     logger.info("TestSimpleCoverings");