Snap for 9710098 from d35a9f8c782b621da27c2430830b94dbff843885 to mainline-tzdata5-release

Change-Id: I6797963a97752fce251898e0348a7d2993eb39f4
diff --git a/tests/Android.bp b/tests/Android.bp
index e008473..378a9c0 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -36,7 +36,7 @@
     static_libs: [
         "localepicker",
         "robolectric_android-all-stub",
-        "Robolectric_all-target",
+        "Robolectric_all-target_upstream",
         "mockito-robolectric-prebuilt",
         "truth-prebuilt",
     ],
@@ -49,4 +49,5 @@
     name: "LocalePickerRoboTests",
     srcs: ["src/**/*.java"],
     instrumentation_for: "LocalePickerTest",
+    upstream: true,
 }