Merge "Removing upstream flag as it is now the default. Also moving to...

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

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



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