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