Merge "Fix bug #10462461 CTS TimePickerTest are broken for testSetOnTimeChangedListener()" into klp-dev