Merge "Remove A2DP connect logic from settingslib"
am: bd249a19bb

Change-Id: I7961d4430eddc17490a4c81baeb61a4d6f2a55bf