Merge "Snap for 11360180 from 966dbfec309f917d9e0da47784b47789b4bc7ae8 to android13-tests-release" into android13-tests-release