Merge "Do not autoconnect hfp if hfp is disallowed but a2dp is" am: 70b8b194

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



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