Snap for 7216820 from a56618e0ceb7930a3ebfa671e0f8598bba61fc96 to android11-tests-release

Change-Id: Id327f425cf3d030d08c8875f93850868e7714abe