Snap for 8482713 from 3a4b134e841be2fefea2a6f46cec85ac29089330 to android12L-tests-release

Change-Id: I9a112599c3216a873bed8d92fb65a9274926cdec