Merge "Snap for 11875702 from 1caa1e267adc082ebcde58e85a2b04f8ea9c558f to android13-tests-release" into android13-tests-release