Android CTS 10.0 Release 4 (6482717)
Merge "Snap for 6182957 from 5bb741cc8cb0f7fe53d7bbc273616bde58df837e to android10-tests-release" into android10-tests-release