diff --git a/src/com/android/settings/RingtonePreference.java b/src/com/android/settings/RingtonePreference.java
index 6117b7df800..e35f24da9c5 100644
--- a/src/com/android/settings/RingtonePreference.java
+++ b/src/com/android/settings/RingtonePreference.java
@@ -54,6 +54,7 @@ import androidx.preference.PreferenceManager;
 public class RingtonePreference extends Preference {
 
     private static final String TAG = "RingtonePreference";
+    private static final String GOOGLE_SP_PKG_NAME = "com.google.android.soundpicker";
 
     private int mRingtoneType;
     private boolean mShowDefault;
@@ -76,7 +77,10 @@ public class RingtonePreference extends Preference {
                 true);
         String packageName = context.getString(R.string.config_sound_picker_package_name);
         Intent intent = new Intent(RingtoneManager.ACTION_RINGTONE_PICKER);
-        if (com.android.internal.util.evolution.Utils.isPackageInstalled(context, packageName)) {
+        // prioritize google sound picker if manually installed by user
+        if (com.android.internal.util.evolution.Utils.isPackageInstalled(context, GOOGLE_SP_PKG_NAME)) {
+            intent.setPackage(GOOGLE_SP_PKG_NAME);
+        } else if (com.android.internal.util.evolution.Utils.isPackageInstalled(context, packageName)) {
             intent.setPackage(packageName);
         }
         setIntent(intent);