Merge "Fix audio glitch when starting/stopping HFP call" into main am: ad70952b am: 727e8d5d

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



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