Merge "Merge "Animate clock fonts with fewer discrete steps" into udc-dev am: 3c4b404c" into udc-dev-plus-aosp am: 541e830f

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



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