Merge "Do not autoconnect hfp if hfp is disallowed but a2dp is" into tm-dev am: f764060b

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



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