Snap for 10609607 from 90cba94e9a4cfe9a3b779b3040fc843d5824f728 to mainline-wifi-release

Change-Id: I24fcf8bb6cfa466b8f357ee98d98248f84d98d7f
diff --git a/dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/Stress.java b/dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/Stress.java
index 6b96f13..63ea3f0 100644
--- a/dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/Stress.java
+++ b/dexmaker-mockito-tests/src/main/java/com/android/dx/mockito/tests/Stress.java
@@ -42,7 +42,7 @@
     }
 
     @LargeTest
-    @Test(timeout=600000)
+    @Test(timeout=1020000)
     public void mockALot() {
         for (int i = 0; i < NUM_TESTS; i++) {
             if (i % 1024 == 0) {