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

Change-Id: I4307481f6df9b2ef9d07eb6066e8fda025bcd4e8