Merge "Snap for 7057780 from 2c963f2b50cc4eea4fcc69f88e7aaad524f6f98e to android10-tests-release" into android10-tests-release