Merge "Audio V4: do not override V4 audo policy config XSD" into pi-dev