Merge "Update Robolectric SDK to 31"