Merge "Add support for Multi-A2DP state machines per device" am: e61ac8ec02
am: a84302f194

Change-Id: I873b29a7c05454ed464fe0f242f0b334115d5f03