Snap for 6885341 from ba43789481ec976d96aa6279401569db8edce4b8 to android11-tests-release

Change-Id: I01c02e7f1bef248056d99b31d675e097e05ae6a6