Removing upstream flag as it is now the default.
Also moving to internal robolectric projects to no longer use the _upstream suffix.
Test: CI
Bug: 386652866
Change-Id: Ic4376619f01834a97ec10c33c283fd7cab45900f
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp
index 552e8cc..3b70def 100644
--- a/tests/robotests/Android.bp
+++ b/tests/robotests/Android.bp
@@ -109,7 +109,7 @@
name: "Settings-robo-testutils",
srcs: ["testutils/**/*.java"],
libs: [
- "Robolectric_all-target_upstream",
+ "Robolectric_all-target",
"Settings-core",
"mockito-robolectric-prebuilt",
"truth",