Merge "audio policy: clarify use of mName field for audio devices" into mnc-dev