Merge "Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices"...
Merge "Merge "Bluetooth: Enable Multi-A2DP/HFP support for up to 5 devices" am: 6ec103c7 am: 472ff2a7" into pi-dev-plus-aosp
am: bfd4a037
Change-Id: I7aade4a7c227208a9d0efaebcd119c6b5823a2bb