Merge "Change the status bar clock's measuring scheme" into tm-dev am:...

Merge "Change the status bar clock's measuring scheme" into tm-dev am: e1e006e1 am: 8d13a0ab am: c305ff1a am: 1cee4f3c

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



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