Snap for 8404407 from d9aa634e4ad2c096eaa4d65982efbc1bd6f2bd56 to androidx-draganddrop-release

Change-Id: I12e48c9dd08ef66b2a385752480284f95fc61272