Merge "Snap for 6918432 from 2c487876a828824481c4856816a6b9e47894547c to android11-tests-release" into android11-tests-release