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

[automerger skipped] Merge "Do not autoconnect hfp if hfp is disallowed but a2dp is" into tm-dev am: f764060b -s ours am: d85604f5 -s ours am: 87d00aa5 -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: I2150fd71f4710bee1235b63b91b894835729acb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>