[automerger skipped] Merge "Update VtsHalAudioPolicyV1_0TargetTest to match...

[automerger skipped] Merge "Update VtsHalAudioPolicyV1_0TargetTest to match XML changes" am: 01ef00b0 am: d9b4080d -s ours am: ac5ac418 -s ours am: d7ed1e7f -s ours

am skip reason: Merged-In Id581e290740a3c00ba3719a339c9bc47d730f35c with SHA-1 43115423 is already in history

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



Change-Id: Ie3ae2eb0631e150b8928f128beece99541f9a368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>