Merge "audio policy: add support for device combo with speaker safe" into mnc-dev