Merge "Fix TextInputLayout not clearing the error on Lollipop" into mnc-ub-dev
am: 8bab339

* commit '8bab339a3dc95ced7f3b2c9c2b3fe8d5a4444be0':
  Fix TextInputLayout not clearing the error on Lollipop

Change-Id: I59f252e66bebd836a8f8b76020f66bd3363393ba