Merge "ASoC: msm: Update the DTS encoder and adm channel map"