[automerger skipped] Merge "Removing upstream flag as it is now the default....

[automerger skipped] 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: 82e3ee53 am: 0b32fa6f -s ours

am skip reason: Merged-In I4cf353cddd57e6e293c7e9a589cbe10fda6b34c2 with SHA-1 2f589024 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3442801



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