Merge "Snap for 14471258 from 2900edb76d256243e8b1493774edc7771df7d5cd to android12L-tests-release" into android12L-tests-release