Snap for 10025019 from daab3e406448b65f7d4f3c137ee772bee291948f to android11-tests-release

Change-Id: Ic101cb5f02e4b08d1cb2a0afcb4300493a85d355