Merge "Extend the TimePickerDialog test to cover 12- and 24-hour clocks."