Merge "Update AudioPort <-> configs mapping"