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

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

Change-Id: I881785a2a1e96aebbd10e148e9f46cda3cee603d