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: 6223323a am: 332ce5c4

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



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