Android VTS 11.0 Release 2 (6961477)
Merge "Snap for 6921418 from 3246426dd61c42de31603b91f9ca37bb5318991d to android11-tests-release" into android11-tests-release