diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 4126bdb5e0d..16a0f33e60a 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -21,7 +21,10 @@
     ([#7337](https://github.com/google/ExoPlayer/issues/7337)).
 *   MPEG-TS: Fix issue where SEI NAL units were incorrectly dropped from H.265
     samples ([#7113](https://github.com/google/ExoPlayer/issues/7113)).
-*   Text
+*   UI:
+    *   Update `TrackSelectionDialogBuilder` to use androidx compat Dialog
+        ([#7357](https://github.com/google/ExoPlayer/issues/7357)).
+*   Text:
     *   Use anti-aliasing and bitmap filtering when displaying bitmap subtitles
         ([#6950](https://github.com/google/ExoPlayer/pull/6950)).
 *   AV1 extension: Add a heuristic to determine the default number of threads
diff --git a/library/ui/build.gradle b/library/ui/build.gradle
index b6bf139963f..8727ba416a5 100644
--- a/library/ui/build.gradle
+++ b/library/ui/build.gradle
@@ -40,6 +40,7 @@ dependencies {
     implementation project(modulePrefix + 'library-core')
     api 'androidx.media:media:' + androidxMediaVersion
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
+    implementation 'androidx.appcompat:appcompat:' + androidxAppCompatVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     testImplementation project(modulePrefix + 'testutils')
     testImplementation 'org.robolectric:robolectric:' + robolectricVersion
diff --git a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
index f8a016bc8b2..5c91645a4ca 100644
--- a/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
+++ b/library/ui/src/main/java/com/google/android/exoplayer2/ui/TrackSelectionDialogBuilder.java
@@ -15,12 +15,12 @@
  */
 package com.google.android.exoplayer2.ui;
 
-import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.SelectionOverride;