Merge "Introduce small clock on the settings screen" into udc-dev am:...

Merge "Introduce small clock on the settings screen" into udc-dev am: 4a3d7406 am: 59788f64 am: ac866bc3 am: 978f8059

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



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