Android cts 11.0 release 6
Merge "Snap for 7812641 from 47bcb9a647a4d79fa4127efc11dc533eff5a9ccc to android11-tests-release" into android11-tests-release