Merge "audiopolicy: get rid of hardcoded attributes <--> stream types"