Merge "Refactor for audio device type in conversion."
am: d3a2bdfc63

Change-Id: I448a0b8fda4b215d17c4908dfc4fce959328fd38