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

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



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