Merge "Add unique device id for usb-c headset and wired headset" into rvc-dev am: 698590ca10

Change-Id: I6962d049bd98c01770d8c96207bf181b89e1cf6f