Merge "Add TextInputEditText to accompany TextInputLayout" into mnc-ub-dev