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

Change-Id: I9fabffc6d7fdb3cb001b685618532f10000dd4ac