Merge "Fix TextInputLayout error being magenta" into nyc-support-24.1-dev am: 50e0a7c64f
am: fa141348a7

Change-Id: I1d344367e752363babde46661ec53edbee478380