Merge "Update AidlConversion for AudioDevices"