Merge changes from topic "atp" into tm-qpr-dev am: e80be01abb am: da800ef537 am: 083ed49f99

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/ThemePicker/+/21563535

Change-Id: Idd9a80afa464a7f9beca57c443a0030771aa2165
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index e0a37c2..4416e1c 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -13,5 +13,8 @@
         "androidx.test.core",
         "androidx.test.runner",
     ],
+
+    upstream: true,
+
     instrumentation_for: "ThemePicker",
 }