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

Change-Id: I88c33f29318ec58c6a9686c8f941acc881f58d90