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: I6d871e1715644325455c5e6a4a635c17ca21d44e