Merge "Bluetooth: Use config value for default max connected audio devices" am: 57f8e717c7  -s ours
am: 786fa66b6d

Change-Id: Ibec2e409300f36f36f2ec005233d32bd4c712e51