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

Change-Id: I80fe36452b078b25f52eef6f22acdb20e06c10f5