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

Change-Id: I2bfe98b532c6fb16e7aaf67f20052271514daf45