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

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

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



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