Merge "Support custom views using TimePickerDialog in layoutlib"