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

Change-Id: I92f92aa833aac3626ce7f0e7145ed8820d8ff9bf