Merge 25Q1 (ab/BP1A.250305.020) to aosp-main-future

Bug: 385190204
Merged-In: I7c8818478477497ffdda60ed5993d4f801f02d9f
Change-Id: Ib00ca7e6cf4b72c68b19857d869d06b868aabf6c
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index a4fd7f3..e775a4d 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -1,4 +1,3 @@
-
 package {
     default_team: "trendy_team_android_kernel",
     default_applicable_licenses: ["Android-Apache-2.0"],
@@ -43,8 +42,6 @@
         "androidx.test.runner",
     ],
 
-    upstream: true,
-
     instrumentation_for: "ThemePickerShell",
 
     strict_mode: false,