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

Change-Id: I26e97c6f6f13b5b37134763f95131e184530b3ad