Merge "ASoC: wcd9310: Add check to prevent the wrap around of channel active value" into msm-3.4