Fixed conflicts

Author: litetex

app/src/main/java/org/schabi/newpipe/player/listeners/view/PlaybackSpeedClickListener.kt

@@ -2,7 +2,7 @@ package org.schabi.newpipe.player.listeners.view
 
 import android.util.Log
 import android.view.View
-import android.widget.PopupMenu
+import androidx.appcompat.widget.PopupMenu
 import org.schabi.newpipe.MainActivity
 import org.schabi.newpipe.player.Player
 import org.schabi.newpipe.player.helper.PlaybackParameterDialog

app/src/main/java/org/schabi/newpipe/player/listeners/view/QualityClickListener.kt

@@ -3,7 +3,7 @@ package org.schabi.newpipe.player.listeners.view
 import android.annotation.SuppressLint
 import android.util.Log
 import android.view.View
-import android.widget.PopupMenu
+import androidx.appcompat.widget.PopupMenu
 import org.schabi.newpipe.MainActivity
 import org.schabi.newpipe.extractor.MediaFormat
 import org.schabi.newpipe.player.Player