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

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

Change-Id: Id3b745f6409dde02c066f389bd259a9417097495