Android VTS 10.0 Release 4 (6483286)
Merge "Snap for 6482848 from 6181087293c1786c61da1aa39ad4a72c8df4831f to android10-tests-release" into android10-tests-release