Merge "ASoC: wcd9310: Fix suspend failure after headset insertion" into msm-3.0