am 6a93c2eb: Merge "Add typeface support to TextInputLayout" into lmp-mr1-ub-dev

* commit '6a93c2eb5ae27f175f71fa025db40660ef0faf69':
  Add typeface support to TextInputLayout