Merge "Update clock complication to match mocks." into tm-qpr-dev am: bc18e296

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



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