Merge "Consolidate two different onTransitionCancelled implementations" into sc-dev am: 029e930751

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

Change-Id: I2c383f800a4904741103095ea2ab8c805764453a