Merge 25Q1 (ab/12770256) to aosp-main-future

Bug: 385190204
Merged-In: Ieb1570d34c1c10c41ee991314be8c867a3acd1f2
Change-Id: Iad5f44c6adcc366e8f1dd7366edf8eaab4d0d1bb

robotests/Android.bp

diff --git a/robotests/Android.bp b/robotests/Android.bp
index 61be339..328b225 100644
--- a/robotests/Android.bp
+++ b/robotests/Android.bp
@@ -23,7 +23,6 @@
     test_options: {
         timeout: 36000,
     },
-    upstream: true,
 
     strict_mode: false,
 }