Merge "Snap for 6918432 from 41d9b29e93c7f8b0bb0d7bd9103de9cc3d7b39d2 to android11-tests-release" into android11-tests-release