Merge "Revert "ASoC: wcd9310: Fix headset detection with mechanical switch"" into msm-3.0