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: 7aa0ef40 am: e96beeeb

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



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