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

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



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