Merge "Added internal API to get/set the A2DP Active Device"
am: 6efee9c079

Change-Id: I5e82a41c4bcf546bdc8fd08c56103c333745c60c