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

Change-Id: Ibbf94535642bbde6e35ee1dacbd27dd13f400f16