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

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



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