Revert "Fix drag and drop (2/3)"

This reverts commit b5e316c3e43aaeca1a83be46eb4fde0be2e7d7d6.

Bug: 137819199
Test: manual
Change-Id: I31e60725035d5af06884521499aed9fc07e505c9
Merged-In: I31e60725035d5af06884521499aed9fc07e505c9
(cherry picked from commit 438fb283e6b2b6c1d42597f1a65eab605800e36d)
3 files changed