Merge "Snap for 9214954 from 62eb5133a04ca8332690bb077b0eb98f9ec5955e to android13-tests-release" into android13-tests-release