Merge "MediaPlayer2: make TrackInfo.getLanguage return NonNull"