Android VTS 11.0 Release 8 (8478917)
Merge "Snap for 8474431 from 776782da82bd0cb1267051af84312c2e63bd26c6 to android11-tests-release" into android11-tests-release