Merge "Tidy up TextInputLayout.setError()" into nyc-dev am: a3f9d4d786
am: 3946120988

* commit '394612098833b4b1d755e6fe877e8a60a863ae5b':
  Tidy up TextInputLayout.setError()