Merge "Revert "Fix audio glitch when starting/stopping HFP call"" into main am: 3b3d3c0d

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/3238754



Change-Id: I11e9f5f316169bb36b475d525ac8467b28b43635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>