Merge "Don't disconnect an A2DP device when connecting to same device" am: 3ebcf1218b
am: c15cc348e8

Change-Id: I0754321d2e289b4c6d2d64a00d13a2d9c2bfcf1c