Snap for 10047227 from c5bde9bbcd0768d5d5ee02c155a8914b433a73ab to android12L-tests-release

Change-Id: I880d5df477beb30e2b703d7d85c7e404bfa8d28b