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

Change-Id: I599c31481eef25311f8500df1428602051f1d04b