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: 8c1c72ea" into rvc-d1-dev-plus-aosp am: 96a588ff
Change-Id: Iaf7a02c59643a336ad726c3aec3e0e01abe1cecc