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

This reverts commit fbe5d9c4233dcd802a122f70ca5a3641fcd556ca.

Bug: 137819199
Test: manual
Change-Id: I7afec569519b9c69eb03225672db6db141b20241
Merged-In: I7afec569519b9c69eb03225672db6db141b20241
(cherry picked from commit 6cbb97591535868d629a562dfd7d8e24865cf551)
8 files changed