Merge "AudioAttributes javadoc update for conversion to stream types"