Merge "Bug fix caused by animation." into udc-dev am: 58897d9b am: b5005fc3 am: 628e64ed

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



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