Merge "Snap for 9184265 from c878f7c8c17e1cbb5b0d21fdd86df333313dc7ed to android12L-tests-release" into android12L-tests-release