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