[automerger skipped] Merge "Refactor audio device type in audio frameworks." am: dd2c24061d am: 13d789d480
am: 621c415f5e -s ours
am skip reason: change_id I2c6fabfafcc6eaf607975076d9ee1a78887a2c85 with SHA1 e1573108fe is in history

Change-Id: I99a8fa5ebb7280aa83dbcbdd5b9e6728fbdc09e0