Android VTS 11.0 Release 6 (7954280)
Merge "Snap for 6885341 from ef289bf27806edac96b9daaf7dd5a3c2c99c0d57 to android11-tests-release" into android11-tests-release