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

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



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