Merge "audio policy: fix stream to volume source mapping"