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: I29fa37ccf0223947ec0ac98a30615fa3d3528f1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>