[automerger skipped] Merge "Fix spacing between clock and date" into sc-v2-dev am: 7f973b2e6e am: 6de0717e58 -s ours

am skip reason: Merged-In I7ec7912ca1db34b8f16f3d8676dc810b1e65177c with SHA-1 760a19581a is already in history

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

Change-Id: Ib21dce7be3dc5c88de6cc4859d70c1ca5ffdac9f