Merge "Bring back time formatting for single line clock" into sc-dev am: 67e353d818

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

Change-Id: I0a2b6289008be559afa67fb318857ec25650f44f