[automerger skipped] Merge "Remove popup container drag listener on close...

[automerger skipped] Merge "Remove popup container drag listener on close complete." into sc-v2-dev am: 1d4dc1ba -s ours am: 718f8e7a -s ours am: 2ac51942 -s ours

am skip reason: Merged-In I16515518c6d488b74450456306abbfff646ac11b with SHA-1 8aa4b05d is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16943984

Change-Id: I6910002974f789cf5bdf81303c60742f7b5281e4