Merge "Add AudioAttributes to stream type conversion" into lmp-dev