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