Merge "Audio policy config xsd: add missing gains and address in ports am: 69ad0a9c6f  -s ours am: cf08dbb02c  -s ours" into oc-mr1-dev