Android CTS 10.0 Release 4 (6482717)
Merge "Snap for 5986893 from 6c79570ba1fa026d83996ad42a7d403c79811695 to android10-tests-release" into android10-tests-release