Merge "Snap for 7978549 from 87bcb22f7b05d95fc6f07b2777dd59ae0bcf1184 to android11-tests-release" into android11-tests-release