Merge "Merge "Make TextInputTimePickerView use localized input" into oc-dr1-dev am: dd74c1a8" into oc-dr1-dev-plus-aosp