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: I4a3ce1cdc32a917600d2da89cf78015a0ee116fd
1 file changed