Merge "Update the imports to androidx.test.filters.*" into main

media/lib/tvremote/tests/Android.bp

@@ -17,6 +17,7 @@ android_test {
     ],
     static_libs: [
         "mockito-target-minus-junit4",
+        "androidx.test.rules",
     ],
     platform_apis: true,
     certificate: "platform",

media/lib/tvremote/tests/src/com/android/media/tv/remoteprovider/TvRemoteProviderTest.java

@@ -29,7 +29,8 @@ import android.media.tv.ITvRemoteServiceInput;
 import android.os.Binder;
 import android.os.IBinder;
 import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
+
+import androidx.test.filters.SmallTest;
 
 import java.util.ArrayList;