Merge "Snap for 8472425 from e9ac9c7fc38e3e10bf2f6f90b7aab36eec69ea3a to android11-tests-release" into android11-tests-release