Android VTS 10.0 Release 7 (7097708)
Merge "Snap for 5986893 from 0830975e2ef30b652d0f0ab906a54f769e4d6fa4 to android10-tests-release" into android10-tests-release