Snap for 6559410 from 2836696feb081eb43ac2734763ad3046a2bd1deb to android10-tests-release

Change-Id: I1ea0ff8c2b41c816762716f855118b1292038ee3