Merge "MediaPlayerService: prevent audio_attributes_t race conditions" into mnc-dev