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

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