Merge "Merge "Update string for 3.5mm and usb audio device" into rvc-dev am:...
Merge "Merge "Update string for 3.5mm and usb audio device" into rvc-dev am: 29ab886b am: 674bf26e am: 435e3d4f" into rvc-qpr-dev-plus-aosp am: 71cc575e
Change-Id: If6ed05b4dadb4ee581dfc54138ebe7170d7cf4d7