Merge "matrices: xmllint --quiet" am: ff7508dee5 am: bb68ce436d

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1607100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If86ced3bf8a2828e2c42371b03e0b1fee6ea5c2c