[automerger skipped] Merge "Activate A2DP and HFP together if available" into...

[automerger skipped] Merge "Activate A2DP and HFP together if available" into tm-qpr-dev am: 23c979d0 -s ours am: e6eafb5c -s ours

am skip reason: Merged-In I642420fb5f6ae941404484ffd9298e22dc897c1e with SHA-1 12eb86d7 is already in history

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



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