Merge "Fix ScrollView requestChildRectangle test" into android13-tests-dev