Merge "Change clock animations to be per-clock face" into udc-dev am: c72bb485 am: bf704b17

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



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