Merge "Added internal API to get/set the A2DP Active Device"