Merge "Snap for 11385719 from 7123abff5170eea24a895e673562815a11fa53ca to android13-tests-release" into android13-tests-release