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

Change-Id: I54fb459074f6119b713c9feeddfe6afba6b99827