Snap for 7303432 from 21ef3ae3fd1dd2076c3b97efa09b3d58e799ce9f to android10-tests-release

Change-Id: Ic6ed7c7bfafc10fbca7c1dd6791045a4daa7d173