Merge "ASoC: wcd9xxx: Fix incorrect detection of mbhc plug type"