Increase timeouts due to performance demanding testcases

- Test timeout increased for Keystore key importing tests (testKeystore_LargeNumberOfKeysSupported_*)
- Increased general timeout due to performance demanding testcases (SignatureTests#testLongMsgKat)

Bug: 120588669
Test: CTS CtsKeystoreTestCases
Change-Id: I2817ce133c139d349cfa257be61c525ed0a95cf8
Merged-In: I2817ce133c139d349cfa257be61c525ed0a95cf8
diff --git a/tests/tests/keystore/AndroidTest.xml b/tests/tests/keystore/AndroidTest.xml
index e2b4986..40beae6 100644
--- a/tests/tests/keystore/AndroidTest.xml
+++ b/tests/tests/keystore/AndroidTest.xml
@@ -23,7 +23,7 @@
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.keystore.cts" />
         <option name="runtime-hint" value="16m39s" />
-        <!-- test-timeout unit is ms, value = 10 min -->
-        <option name="test-timeout" value="600000" />
+        <!-- test-timeout unit is ms, value = 50 min -->
+        <option name="test-timeout" value="3000000" />
     </test>
 </configuration>
diff --git a/tests/tests/keystore/src/android/keystore/cts/AndroidKeyStoreTest.java b/tests/tests/keystore/src/android/keystore/cts/AndroidKeyStoreTest.java
index 4bd6965..79f87e0 100644
--- a/tests/tests/keystore/src/android/keystore/cts/AndroidKeyStoreTest.java
+++ b/tests/tests/keystore/src/android/keystore/cts/AndroidKeyStoreTest.java
@@ -1998,8 +1998,8 @@
 
     private static final int MIN_SUPPORTED_KEY_COUNT = 1500;
     private static final long MINUTE_IN_MILLIS = 1000 * 60;
-    private static final long LARGE_NUMBER_OF_KEYS_TEST_MAX_DURATION_MILLIS = 2 * MINUTE_IN_MILLIS;
-    private static final long LARGE_NUMBER_OF_KEYS_TEST_MAX_DURATION_WATCH_MILLIS = 3 * MINUTE_IN_MILLIS;
+    private static final long LARGE_NUMBER_OF_KEYS_TEST_MAX_DURATION_MILLIS = 4 * MINUTE_IN_MILLIS;
+    private static final long LARGE_NUMBER_OF_KEYS_TEST_MAX_DURATION_WATCH_MILLIS = 6 * MINUTE_IN_MILLIS;
 
     private static boolean isDeadlineReached(long startTimeMillis, long durationMillis) {
         long nowMillis = System.currentTimeMillis();