Merge "Add support for Multi-A2DP state machines per device" am: bb5318df8a am: adf2239562
am: bc2e4a230b  -s ours

Change-Id: Iae0f6c59f152c391f319de580d3f9a0ac19be31a