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

Change-Id: Ied10c0f345ed1fc44db5814ae15ab97cd48662f2