Merge "Convert AudioAttribute to Stream correctly" am: 024387744a am: ce31fe2fb8
am: 8aac09b0c6

Change-Id: I5e9449c7ce71b7cec57443fe3d994c5c5e87336d