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

Change-Id: Iea5dd7f438b8e25e1d8b67ae6be4c320e701d406