Merge "Snap for 9481218 from 23b6ba697d870998963f061e4eafecbe06f4e775 to android11-tests-release" into android11-tests-release