Merge "Audio:Reduce the delay during headset removal" into p-keystone-qcom