Snap for 6000799 from 031f612a966255ee5a49dba640e95a407f221ab1 to android10-tests-release

Change-Id: I16e8549ce25cea1e031293e9dcacb380b30f0f00