Merge "Merge "Fix TimePickerDialog positive button clicks." into oc-dev am: 87c727a169" into oc-dev-plus-aosp