Fix release branch

library/core/src/main/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelector.java

@@ -661,7 +661,7 @@ public class DefaultTrackSelector extends MappingTrackSelector {
 
 
     private Parameters() {
     private Parameters() {
       this(
       this(
-          /* selectionOverrides= */ new SparseArray<>(),
+          /* selectionOverrides= */ new SparseArray<Map<TrackGroupArray,SelectionOverride>>(),
           /* rendererDisabledFlags= */ new SparseBooleanArray(),
           /* rendererDisabledFlags= */ new SparseBooleanArray(),
           /* preferredAudioLanguage= */ null,
           /* preferredAudioLanguage= */ null,
           /* preferredTextLanguage= */ null,
           /* preferredTextLanguage= */ null,

library/ui/src/main/java/com/google/android/exoplayer2/ui/SubtitlePainter.java

@@ -28,6 +28,7 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.RectF;
 import android.text.Layout.Alignment;
 import android.text.Layout.Alignment;
 import android.text.SpannableStringBuilder;
 import android.text.SpannableStringBuilder;
+import android.text.Spanned;
 import android.text.StaticLayout;
 import android.text.StaticLayout;
 import android.text.TextPaint;
 import android.text.TextPaint;
 import android.text.TextUtils;
 import android.text.TextUtils;