Merge "Uptesting is moving folks to /external/robolectric from /external/robolectric-shadows" into main