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: Ib3abf869fd13d685d220f52032a92a55b7e80e7e
Merged-In: I4cf353cddd57e6e293c7e9a589cbe10fda6b34c2
diff --git a/libs/WindowManager/Shell/multivalentScreenshotTests/Android.bp b/libs/WindowManager/Shell/multivalentScreenshotTests/Android.bp
index b6db6d9..4043a1c 100644
--- a/libs/WindowManager/Shell/multivalentScreenshotTests/Android.bp
+++ b/libs/WindowManager/Shell/multivalentScreenshotTests/Android.bp
@@ -38,7 +38,6 @@
 android_robolectric_test {
     name: "WMShellRobolectricScreenshotTests",
     instrumentation_for: "WMShellRobolectricScreenshotTestApp",
-    upstream: true,
     java_resource_dirs: [
         "robolectric/config",
     ],