[automerger skipped] Make Animators pass internal tests am: 139b27a4 am: 5c277419 -s ours

am skip reason: Merged-In Icdf2e9d75d93fa6a4e99833c24a40b48b051f568 with SHA-1 139b27a4 is already in history

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



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