[automerger skipped] Merge "Fix spacing between clock and date" into...

[automerger skipped] Merge "Fix spacing between clock and date" into sc-qpr1-dev am: 40ab2330 -s ours am: efcfe54d -s ours

am skip reason: Merged-In I7ec7912ca1db34b8f16f3d8676dc810b1e65177c with SHA-1 53033a86 is already in history

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

Change-Id: I89d64fdf1db083881e2093b82ba43756a58f571e