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

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

Change-Id: I2fb85285b8b55b581b124e9bdae6f5743e3ee556