Merge "Dynamic audio policies: device type and address" into nyc-dev
am: 4003499

* commit '400349907ec5bb09887e5ba9f9cd1fa1f3d06716':
  Dynamic audio policies: device type and address