Merge "AudioPolicy: tighter match for device descriptor query" into nyc-dev