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