Merge "Fix issue where two translation animations clobber each other." into tm-qpr-dev am: 56e660c6f3 am: 43102d323b

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

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