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

Change-Id: Ibe372b2ecda317e7970d6e681a4e2330e69782c1