Merge "Remove A2DP connect logic from settingslib" am: bd249a19bb am: 2b614b6ea9
am: 1bc55c7df5

Change-Id: Ib571b93298c46885d90672dc9330ea67f90d053f