am 6f4428de: am d99c6855: Merge "audio policy: match attached device to declared devices" into lmp-mr1-dev

* commit '6f4428de2b4ab10393bbac2441586ac514c8cf53':
  audio policy: match attached device to declared devices