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