Merge "Convert AudioAttribute to Stream correctly"
am: 024387744a

Change-Id: If8b0bd7b8fa83bddd29b0c15aef0f3a719b7be5f