Android VTS 11.0 Release 2 (6961477)
Merge "Snap for 6958439 from 3b3a690f15ec960ec465867340370fd2c8da840b to android11-tests-release" into android11-tests-release