Merge "Restore TimePickerDialog#onClick behavior."