Merge "audio policy: add device for audio bus" into nyc-dev