Merge "Snap for 7303432 from 21ef3ae3fd1dd2076c3b97efa09b3d58e799ce9f to android10-tests-release" into android10-tests-release