Merge "Fix test config" into main am: 4f19466f56

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3114506

Change-Id: I96194603f06e24effecbbf3f04cbea01e21e7c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/Enable16KbTests/Android.bp

@@ -17,7 +17,7 @@ package {
     default_team: "trendy_team_android_kernel",
 }
 
-android_test_helper_app {
+android_test {
     name: "test_16kb_app",
     srcs: ["test_16kb_app/src/**/*.java"],
     manifest: "test_16kb_app/test_16kb_app.xml",

tests/Enable16KbTests/test_16kb_app/test_16kb_app.xml

@@ -16,8 +16,8 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.settings.development.test"
-          android:sharedUserId="android.uid.systemui">
+          android:installLocation="internalOnly"
+          package="com.android.settings.development.test">
     <application>
         <uses-library android:name="android.test.runner"/>
     </application>