bluetooth:  fix  a merge

Change-Id: I8f4c54d9e112a9727fe9f6b5e3ed08a69cfea326
Bluetooth: Changing vendor ID as Qualcomm for Device ID Profile

As per Specification, Device providers should configure the
vendor ID as the Company Identifier provided by the Bluetooth
SIG. Hence Changing vendor ID as Qualcomm for Device ID Profile.

Change-Id: I852113d2849ea4fd0725396fc92f320101aab0d0
CRs-Fixed: 547495