Merge "Snap for 8404407 from b220434147c222eca3f57b3be6eeefee906fd567 to androidx-draganddrop-release" into androidx-draganddrop-release