Merge "API for converting AudioAttributes to stream type" into mnc-dev