Merge "AudioService: fix AudioProductStrategy matching rule"