Merge "Snap for 9151979 from 2ee8713ab03d6984b8b07b2f3b3b2c043998b512 to android12L-tests-release" into android12L-tests-release