Merge "Remove incoming HFP connection if outgoing exists" am: 85b92d46 am:...

Merge "Remove incoming HFP connection if outgoing exists" am: 85b92d46 am: be2d222d am: 3ac9eb9b am: be3ceeca

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2128195



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