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

* commit '905d50834def592740d666b4c49549137bdf5899':
  AudioPolicy: tighter match for device descriptor query