[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 main am: bc7df575 am: 59d978c7 -s ours am: ff3d15cb -s ours

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

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



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