Snap for 8634534 from 5825d17d0e3beeff3fdc670cf68e6df88832f398 to android12L-tests-release

Change-Id: Ie6b1b9e6629b1ff4553a97ab6b1233f9b1059fee