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

Change-Id: Ibf2e9fb0a5939f45a9d21bc06b26ef719ff9c58f