Snap for 6159284 from ea5c4aa4e61053e32d0781ce7397dbb068110727 to android10-tests-release

Change-Id: I70fc4c023d18aefcce5234dc7378e42c34e7a3f0