Merge "Bring back time formatting for single line clock" into sc-dev am: 67e353d8 am: 857a5a2b am: d9209129

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

Change-Id: Ic2a29c8413cddbe1c9a142d37ffaa73e34a6e3ce