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

Change-Id: I0901d4076b693d43796fa5552dc0ee5ac383b70e