Merge "Cherry-pick changes to select module accurately" into tm-dev
diff --git a/hostsidetests/scopedstorage/Android.bp b/hostsidetests/scopedstorage/Android.bp
index da0df31..527e8ef 100644
--- a/hostsidetests/scopedstorage/Android.bp
+++ b/hostsidetests/scopedstorage/Android.bp
@@ -210,7 +210,7 @@
     min_sdk_version: "29",
 }
 
-android_test {
+android_test_helper_app {
     name: "ScopedStorageTest",
     manifest: "AndroidManifest.xml",
     srcs: ["src/**/*.java"],
@@ -237,7 +237,7 @@
     ],
 }
 
-android_test {
+android_test_helper_app {
     name: "LegacyStorageTest",
     manifest: "legacy/AndroidManifest.xml",
     srcs: ["legacy/src/**/*.java"],