Snap for 8634534 from e5b8f3dea08cb2810679e115d752be7f3bd3e54c to android12L-tests-release

Change-Id: Iff8483e41775b4a48d27eef2f60c6b6a2c2d2221