Merge "Dynamic audio policies: fix AttributeMatchCriterion addition in mix"