[automerger skipped] Merge "Don't stash immediately when drag was canceled"...

[automerger skipped] Merge "Don't stash immediately when drag was canceled" into tm-qpr-dev am: d9dd75d2 am: 552fe5ec -s ours

am skip reason: Merged-In I06ca0eccbfe313dbae8f6d96c7c09bb659f6a27b with SHA-1 c691dcba is already in history

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



Change-Id: I108d71c686c01482bd695204c51d4028b12c24d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>