Merge "Don't stash immediately when drag was canceled" into tm-qpr-dev am: d9dd75d2

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



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