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: 16e09b27 am: 65649b51 am: 316085fe

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



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