Merge "Snap for 6995593 from 29de667ef3e0ed6a9fbbfd1d150c37b39350acc4 to android11-tests-release" into android11-tests-release