Merge "ASoC: wcd9310: Don't overwrite detected unsupported headset" into msm-3.4