Merge "Ensure that the cancel and end listener are called when cancelling state animation" into sc-dev am: 012e978e31 am: 38e3dbe38e am: daef8063b4

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

Change-Id: I55a83f6e1ef877739ec23ae5d2248a2cdab66b76