Snap for 9678987 from d6533d0bf9e4d4321b0cd1bafafaf40ab48097db to android11-tests-release

Change-Id: I8a30786aa7c1637e33cc2fd219ab38da22d9d9a9