Merge "Clean up Settings to allow a2dp, hfp, and le audio to be simultaneously connected on the same device" am: ca3aa2a557 am: 9526a60e6b am: 9145d7e6ce

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

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