Merge "Refactor audio device type in audio frameworks."
am: dd2c24061d

Change-Id: I56880a1abcbc9c0bd663899b3b6a80a87c7090d9