Merge "Snap for 5986893 from 843c0ce58eec1199b5dcf3e764ac7c6bee6edbdd to android10-tests-release" into android10-tests-release