Merge "Activate A2DP and HFP together if available" am: d0e2839c am: 0f959a5b am: af340e23

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



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