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

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

Change-Id: Idfdbfbd8d82c4e78ed01869ff12ee5dcb38ba3d4