Merge changes I9efa7144,Id005aad9

* changes:
  audiopolicy: Add support for the MSD prototype
  audiopolicy: Add AudioProfileVector::findBestMatchingOutputConfig