Merge "msm: audio: qdsp6v2: PCM Encoder is configured to native channel count" into msm-3.0