Snap for 9018643 from c84be7da037a0f30f47e3fe9dde9493abe086468 to android12L-tests-release

Change-Id: Ia38dd373230a805598dc49a0c5b64a17491cc19d