Merge "audio policy: fix several device descriptor issues." into mnc-dev