Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously...

Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a5 am: 9526a60e

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375795



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