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

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

Change-Id: I9c2551a3a8b3a9db5a785d8cda75a07f4b147a17