Merge "Revert^2 "Cancel gestures on launcher destroy"" into tm-qpr-dev am: 74484f4a

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



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