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: Ic707ef14704b219065cc178ad7e1abb92e327027
diff --git a/javatests/Android.bp b/javatests/Android.bp
index 009d9a9..7958145 100644
--- a/javatests/Android.bp
+++ b/javatests/Android.bp
@@ -55,7 +55,7 @@
 
     libs: [
         // This jar should not be included, android_robolectric_test soong tasks either ads
-        // "Robolectric_all-target" or "Robolectric_all-target_upstream" based on the "upstream"
+        // "Robolectric_all-target" or "Robolectric_all-target" based on the "upstream"
         // flag below.
         "androidx.test.core",
         "mobile_data_downloader_lib",