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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie787041c731f9f3f29959bab71f8478952b6298b