Merge "AudioAttributes: add missing stream type to conversions"