[automerger skipped] Merge "Remove Unicode whitespace before AM/PM in the...

[automerger skipped] Merge "Remove Unicode whitespace before AM/PM in the status bar" into udc-dev-plus-aosp am: fe49bee8 am: 7483b91d -s ours

am skip reason: Merged-In I7b660b94c6ef75dbe96be8bcd2b074c8edd73ba7 with SHA-1 e01e702f is already in history

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



Change-Id: Ic1ac5b5ed211f6d26a671993625a7ff8471766a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>