Merge "Snap for 6873960 from dd9328b45dcd84ffc49273d671c3e03c1034f92e to android11-tests-release" into android11-tests-release