Merge "Revert "Update Robolectric SDK to 30"" into sc-dev