Merge "Remove Unicode whitespace before AM/PM in the status bar" into udc-dev-plus-aosp am: fe49bee8b9

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

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