Merge "ASoC: msm: qdsp6: Fixed the issue unmap command is sent incorrectly" into msm-3.4