Merge "Update VtsHalAudioPolicyV1_0TargetTest to match XML changes" into tm-dev-plus-aosp