Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev
am: dd74c1a8cd

Change-Id: I23c2927e8281cb00f4d0fef8c83bcdebb2f682c7