Merge "Fix missing call to super cancel method" into tm-qpr-dev am: 607a9766 am: ec981ec5

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



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