Merge "Snap for 6221070 from cd7a0189178f3f4e491d95c9b6bbd1c05df81b89 to android10-tests-release" into android10-tests-release