Merge "Introduce small clock on the settings screen" into udc-dev am: 4a3d7406 am: 07682a65

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



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