Merge "Fix bug where unstash animation plays twice." into udc-dev am: ba4fcb0171 am: 0c8b5e834e

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

Change-Id: I20fb60719e5e1186289e863087ab65f6598aa861
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>