Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am: f9504d8979 am: 0859a07a61
am: 718af4ba73  -s ours

Change-Id: I77cf919485c824de5a64859ae13e88eeda8f9aad