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

Change-Id: Ie4463c29ccfac02d0535af75cdde0dc63c4ce54f