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

Change-Id: I364fdcbd2017a88f178fdf9a972249be38700aa0