[automerger skipped] Merge "Re-write conditional checks for animation" into...

[automerger skipped] Merge "Re-write conditional checks for animation" into udc-qpr-dev am: 3148e971 am: 45c5fd10 -s ours

am skip reason: Merged-In Iebda8c9acfbf75a49522887687702b2e8c0158de with SHA-1 9bc94e9c is already in history

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



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