Merge "Fix audio glitch when starting/stopping HFP call" into main am: ad70952b82

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

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