Merge "TimePickerDialog OTG keyboard entry discarded" am: 8c2cb6ff08
am: 2973f63816

Change-Id: Ia9904d1654ec70e1c039d8f1fed6c1211863ee38