Merge "Bluetooth  HAL uses "default" service name"
am: 742c4db343

Change-Id: Ia952591516474e0b0899e5043ccfb3f9ce5520af