[automerger skipped] Merge "Do not autoconnect hfp if hfp is disallowed but a2dp is" into tm-dev am: f764060b am: 3a119a49 am: 6d583db7 -s ours am: ede007d9 -s ours

am skip reason: Merged-In Ic712a6de47e9df83db182028963f857817e6b789 with SHA-1 16ffade7 is already in history

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



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