Merge "Snap for 8634534 from 5825d17d0e3beeff3fdc670cf68e6df88832f398 to android12L-tests-release" into android12L-tests-release