Merge "Activate HFP and A2DP at the same time" am: d55767c7

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



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