Snap for 6646334 from ca73a3d5b78a469cf805e155ebdff4f890055fec to android10-tests-release

Change-Id: Iae1af072493d258aec6f51ce74d10ce9e51e8c01