Merge changes from topic "fix-b-142480271-xml-deserializer" am: a3b2ea24c4 am: c57b216a49 am: 7afd309e00

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iec9bb683d7274c65d08ec1e0f99789ada6aaf0f6