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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib3af534ab0261515de897c36f557a52543444f0a