Merge "Do not start drag from pre-drag if cancelled during animation." into tm-qpr-dev am: 0ccbd7334c am: 5ff72eaa46

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

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