Merge "ASoC: msm: qdsp6v2: Set correct default channel map on adm"