Snap for 8020139 from f4a0358ad9c0c126922529a5f10c84be05cbf3c4 to android12-tests-release

Change-Id: Iceb58a88f06f02693657dbd760990afe177fab34