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

Change-Id: I91e28ff9aa7b2bea64dcfe2371f8a734ea8cbb6e