Merge "Snap for 6918432 from 39f57f120b9977c5d275a1e555f687326e957ee5 to android11-tests-release" into android11-tests-release