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

* commit '2dda40d638138c426cf4a66ddd0da8794c87f5c7':
  audio policy: add support for custom mixes