Merge "Allow both category of A2DP devices to be connected" into main am: 82e31399

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



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