Merge "ASoC: wcd-mbhc: correct detection logic for headphone" into msm-4.9