Merge "Convert AudioAttribute to Stream correctly for TTS" am: 874e10f4a6 am: 96b6adc014
am: 76b988ad23

Change-Id: I9935ce0eaaa1f50246c242c0190cb4408b243248