[automerger skipped] Merge "Refactor for audio device type in conversion." am: d3a2bdfc63 am: f754eda039
am: 594181e51c -s ours
am skip reason: change_id I1a0f574744f855bb1684cd28613571399781abbc with SHA1 98fd544712 is in history

Change-Id: I7500dd8508922343b01d945ff693d6b15f30edf8