Android VTS 10.0 Release 6 (6926900)
Merge "Snap for 6646334 from ca73a3d5b78a469cf805e155ebdff4f890055fec to android10-tests-release" into android10-tests-release