Android VTS 11.0 Release 2 (6961477)
Merge "Snap for 6935820 from 7988343ad3cfeff3a51b35cd9911a16081111575 to android11-tests-release" into android11-tests-release