[automerger skipped] Merge "Remove AnimatableClockController in favor of...

[automerger skipped] Merge "Remove AnimatableClockController in favor of ClockEventController" into tm-qpr-dev am: a1cd1e09 am: 25c0723d -s ours

am skip reason: Merged-In I10a18f0e753962064f9ac12f3d15f955ce419cbf with SHA-1 3d244cce is already in history

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



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