Snap for 8907068 from 3abe3252633b0d1c66c7bb0432dfaacaf7b420bc to android12L-tests-release

Change-Id: I51206db382f8d4ca9fd721d8cdc5062455d7c26e