Merge "Add null check when resetting animation" into sc-dev am: b2a72da335 am: eacb3c06c2

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

Change-Id: I0f06b03024bffd016ac9def691524eb1af830fad