Merge "Revert "Fix audio glitch when starting/stopping HFP call"" into main