Merge "Improved autofill support on DatePicker and TimePicker:" into oc-mr1-dev am: 6598a4ed52
am: e6be222bdf

Change-Id: Ib478276e91d26e5040aa1d9e658c155a0d6224e7