Fixing animation behavior on UMO snapback am: 4e512f9f98 am: d596b6e4f1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20140431

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