Android VTS 10.0 Release 7 (7097708)
Merge "Snap for 7090880 from d1c906900055ea6e3dd3f181120c165f30b5a205 to android10-tests-release" into android10-tests-release