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