Merge "Snap for 6986539 from 3dc35500059ac99c2d2c2afc799f21b473fdc17f to android11-tests-release" into android11-tests-release