Merge "audio policy: fix a2dp output detection"