Snap for 6381431 from d200d089df63cc7b2d2a24531feb828b5357e60e to android10-tests-release

Change-Id: Ie5f799d21499ae1c1a3f4c6a73afdddffdca4d6b