Merge "Merge "Audio policy config xsd: add missing gains and address in ports" into oc-dev am: 90e68d31cf am: 3f60c009dc" into oc-dr1-dev-plus-aosp