Android VTS 10.0 Release 7 (7097708)
Merge "Snap for 7080482 from 5de2ca070d96ac50ccdbb6760ef9b65c0d6fb251 to android10-tests-release" into android10-tests-release