am "am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev automerge: ab027932"

merged from goog/mirror-m-wireless-internal-release
b2c88488 am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into lmp-dev automerge: ab027932