Snap for 8634534 from 80b18d3ededacb14cd85ffbf10a41b17d5fb79c0 to android12L-tests-release

Change-Id: Ide0f1e2b7492d3a90c143b4a0288dd28a2b6c454