[automerger skipped] Do not autoconnect hfp if hfp is disallowed but a2dp is...

[automerger skipped] Do not autoconnect hfp if hfp is disallowed but a2dp is am: 16ffade7 -s ours am: 94d82f57 -s ours am: dcbcade0 -s ours am: 0af9d6f4 -s ours

am skip reason: Merged-In Ic712a6de47e9df83db182028963f857817e6b789 with SHA-1 11cb95ec is already in history

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



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