Merge "Update AM/PM selectors for clock face TimePicker" into lmp-mr1-dev