Merge "audio policy: add support for custom mixes" into lmp-mr1-dev