Merge "Added the default format and ordering of columns for TimePicker" into nyc-support-25.2-dev
am: ab90877071

Change-Id: Idd5d4853b6ba04200f225a1861c09ab52d7bc8fe