Snap for 9158858 from 8a9954046b03fca9f6ed131014385da9b99d4638 to android11-tests-release

Change-Id: I2b7d5bfa183270859e4129940b993e1596b167f2