Merge "ASoC: msm: qdsp6v2: update default channel mapping"