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

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11387092

Change-Id: I6e318d19d4acb1893c33347add72b06d5318c63a