[automerger skipped] Merge "Fix taskbar icon dragging issues" into sc-v2-dev...

[automerger skipped] Merge "Fix taskbar icon dragging issues" into sc-v2-dev am: 9f0d54eb am: 0702c253 -s ours

am skip reason: Merged-In I848138af28802f7d806708c77c25b8de307c70d8 with SHA-1 312b68fd is already in history

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

Change-Id: I427464648ea7ba66c08692d3734f39857fab70bb