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

Change-Id: I2924dfe291a6a29620d4e22c47c32716516911e3