Merge "ASoC: wcd934x: Add delay during headphone path bringup and teardown" into msm-4.9