Snap for 11517367 from 22c93c429c32a93c1421b21332d370393ab68726 to 24Q2-release

Change-Id: I0474760992ae1332f9fb5611a2bffb66bbe9f315
diff --git a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingTest.java b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingTest.java
index 2577d05..fb337e0 100644
--- a/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingTest.java
+++ b/tests/java_api/ImageProcessing_jb/src/com/android/rs/image/ImageProcessingTest.java
@@ -21,9 +21,10 @@
 import android.os.Bundle;
 import android.os.Environment;
 import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Log;
 
+import androidx.test.filters.MediumTest;
+
 import com.android.rs.imagejb.IPTestListJB.TestName;
 
 import java.io.BufferedWriter;
diff --git a/tests/java_api/RsBLAS_Benchmark/src/com/example/android/rs/blasbenchmark/BlasTest.java b/tests/java_api/RsBLAS_Benchmark/src/com/example/android/rs/blasbenchmark/BlasTest.java
index e12aca4..e4deb89 100644
--- a/tests/java_api/RsBLAS_Benchmark/src/com/example/android/rs/blasbenchmark/BlasTest.java
+++ b/tests/java_api/RsBLAS_Benchmark/src/com/example/android/rs/blasbenchmark/BlasTest.java
@@ -20,9 +20,10 @@
 import android.app.Activity;
 import android.os.Bundle;
 import android.test.ActivityInstrumentationTestCase2;
-import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Log;
 
+import androidx.test.filters.MediumTest;
+
 import com.example.android.rs.blasbenchmark.BlasTestList.TestName;
 
 /**