[automerger skipped] Merge "Follow up Androidx dynamic animation api change"...

[automerger skipped] Merge "Follow up Androidx dynamic animation api change" into tm-dev am: 5cc20aa2 -s ours am: 392a254e -s ours

am skip reason: Merged-In Iaa0e787675f53ac16cf61f2d2b6adae02ab55623 with SHA-1 dc5b93b3 is already in history

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



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