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: Ibe974040cfd1e988c4cf3ad7a110d361d6cff064
Merged-In: Id3e0c269908f9af0d554a33853765356dfb7ee57
1 file changed