Merge "Snap for 6092303 from f9e600c112fed39d09d62ec558a474621219efd5 to android10-tests-release" into android10-tests-release