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

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



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