Merge "Update APM XML deserializer for HAL V7" am: 34da2e29 am: f7795707 am: 52d87e41

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1576904

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If720a6262e1abbc4ed3c7682e2629bd2588ac6de