Merge "Audio policy config: Device port (type,address) must be unique am: 117188b315  -s ours am: f4f190fd03  -s ours" into oc-mr1-dev am: 8f8e3e44db  -s ours
am: e4798e4384  -s ours

Change-Id: If69c344fb23d4440c84f51b5c3891d35c95b4df5