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

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



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