Merge "Add Settings support for Bluetooth Multi-A2DP and Multi-HFP" am: 3151e86aa8 am: b51d583e32
am: a6d7e270af  -s ours

Change-Id: I81430ac8e91ede366ca151ced8b9eb1cccaa87be