[Android] Upstream some java test annotations.

base/test/android/javatests/src/org/chromium/base/test/util/TimeoutScale.java

Index: base/test/android/javatests/src/org/chromium/base/test/util/TimeoutScale.java
diff --git a/base/test/android/javatests/src/org/chromium/base/test/util/DisabledTest.java b/base/test/android/javatests/src/org/chromium/base/test/util/TimeoutScale.java
similarity index 66%
copy from base/test/android/javatests/src/org/chromium/base/test/util/DisabledTest.java
copy to base/test/android/javatests/src/org/chromium/base/test/util/TimeoutScale.java
index c2b2ecddcda345745d1980aa5c961b8ba6e0add2..a3b0641cf284d3f081e34e7757c5d792b6444a58 100644
--- a/base/test/android/javatests/src/org/chromium/base/test/util/DisabledTest.java
+++ b/base/test/android/javatests/src/org/chromium/base/test/util/TimeoutScale.java
@@ -10,12 +10,13 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * This annotation is for disabled tests.
- * <p>
- * Tests with this annotation will not be run on any of the normal bots.
- * Please note that they might eventually run on a special bot.
+ * This annotation can be used to scale a specific test timeout.
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface DisabledTest {
+public @interface TimeoutScale {
+    /**
+     * @return A number to scale the test timeout.
+     */
+    public int value();
 }