Fix Bluetooth name for unified

Change-Id: I19f4c0412de19be7fc24c39920d91180ef6bc072
Merge branch 'cm-11.0' into mokee
mokee bringup

Change-Id: I738fe74fe38aa070ead2a4e086a2e396f813d54f