Snap for 6885341 from e51b4480efa4a743fd41d7ed1efc9134f1041359 to android11-tests-release

Change-Id: Ic102d37739f2ff459cce7f82dd9b6b335855439a