Merge "Remove A2DP connect logic from settingslib"