Android CTS 10.0 Release 7 (7080471)
Merge "Snap for 7068654 from 6ea1b6912ae4116ab28baa223a6521cd5fbb0158 to android10-tests-release" into android10-tests-release