Update the imports to androidx.test.filters.*

Bug: 316941721
Test: mmma .
Change-Id: Ie1c62b7eb4a1cb413d41ac94eb2eda9670704057

test-runner/tests/Android.bp

@@ -33,7 +33,10 @@ android_test {
         "android.test.base",
         "android.test.mock",
     ],
-    static_libs: ["junit"],
+    static_libs: [
+        "junit",
+        "androidx.test.rules",
+    ],
 
     // Include all test java files.
     srcs: ["src/**/*.java"],

test-runner/tests/src/android/test/AndroidTestRunnerTest.java

@@ -17,7 +17,8 @@
 package android.test;
 
 import android.test.mock.MockContext;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import junit.framework.AssertionFailedError;
 import junit.framework.Test;

test-runner/tests/src/android/test/InstrumentationTestRunnerTest.java

@@ -22,7 +22,8 @@ import android.os.Bundle;
 import android.test.mock.MockContext;
 import android.test.suitebuilder.ListTestCaseNames;
 import android.test.suitebuilder.ListTestCaseNames.TestDescriptor;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import junit.framework.Test;
 import junit.framework.TestCase;

test-runner/tests/src/android/test/suitebuilder/examples/suppress/PartiallySuppressedTest.java

@@ -16,7 +16,7 @@
 
 package android.test.suitebuilder.examples.suppress;
 
-import android.test.suitebuilder.annotation.Suppress;
+import androidx.test.filters.Suppress;
 
 import junit.framework.TestCase;
 

test-runner/tests/src/android/test/suitebuilder/examples/suppress/SuppressedTest.java

@@ -16,7 +16,7 @@
 
 package android.test.suitebuilder.examples.suppress;
 
-import android.test.suitebuilder.annotation.Suppress;
+import androidx.test.filters.Suppress;
 
 import junit.framework.TestCase;