Snap for 10660135 from 4e3999babdcde06789c7ced7a5d7c5405f510434 to android12-tests-release

Change-Id: I0b3db798615634e3e446b3fe9ee587c0e0128675