Merge "fix AudioAttributes matching rule in AudioProductStrategy" into qt-dev
am: 41a45543c4

Change-Id: I16dacfe98a8b5a39effb0d7a8236b14fa5b216f4