Merge "Removing upstream flag as it is now the default. Also moving to internal robolectric projects to no longer use the _upstream suffix." into main am: 7aa0ef4049

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3443580

Change-Id: Ia834fda59f1beba933dc92abffcdf4d680863f43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

tests/robotests/Android.bp

@@ -109,7 +109,7 @@ java_library {
     name: "Settings-robo-testutils",
     srcs: ["testutils/**/*.java"],
     libs: [
-        "Robolectric_all-target_upstream",
+        "Robolectric_all-target",
         "Settings-core",
         "mockito-robolectric-prebuilt",
         "truth",