diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index ea8a5f560f9..3c6077e3c24 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -15,6 +15,8 @@
  */
 package com.android.settings.connecteddevice;
 
+import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
+
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.net.Uri;
@@ -36,7 +38,6 @@ import com.android.settingslib.search.SearchIndexable;
 public class ConnectedDeviceDashboardFragment extends DashboardFragment {
 
     private static final String TAG = "ConnectedDeviceFrag";
-    private static final String SETTINGS_PACKAGE_NAME = "com.android.settings";
     private static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
     private static final String SLICE_ACTION = "com.android.settings.SEARCH_RESULT_TRAMPOLINE";
diff --git a/src/com/android/settings/network/MobileNetworkIntentConverter.java b/src/com/android/settings/network/MobileNetworkIntentConverter.java
index 651215a3cca..f500c52e373 100644
--- a/src/com/android/settings/network/MobileNetworkIntentConverter.java
+++ b/src/com/android/settings/network/MobileNetworkIntentConverter.java
@@ -16,6 +16,8 @@
 
 package com.android.settings.network;
 
+import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
+
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
@@ -51,7 +53,7 @@ public class MobileNetworkIntentConverter implements Function<Intent, Intent> {
     private static final String TAG = "MobileNetworkIntentConverter";
 
     private static final ComponentName sTargetComponent = ComponentName
-            .createRelative("com.android.settings",
+            .createRelative(SETTINGS_PACKAGE_NAME,
                     MobileNetworkActivity.class.getTypeName());
     private static final String INTENT_TRAMPOLINE = "android.settings.SEARCH_RESULT_TRAMPOLINE";
     /**
diff --git a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
index a19702fcb06..72d9e91ff77 100644
--- a/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
+++ b/src/com/android/settings/network/telephony/gsm/AutoSelectPreferenceController.java
@@ -19,6 +19,8 @@ package com.android.settings.network.telephony.gsm;
 import static androidx.lifecycle.Lifecycle.Event.ON_START;
 import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
 
+import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
+
 import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.Intent;
@@ -170,8 +172,8 @@ public class AutoSelectPreferenceController extends TelephonyTogglePreferenceCon
         } else {
             if (mSwitchPreference != null) {
                 Intent intent = new Intent();
-                intent.setClassName("com.android.settings",
-                        "com.android.settings.Settings$NetworkSelectActivity");
+                intent.setClassName(SETTINGS_PACKAGE_NAME,
+                        SETTINGS_PACKAGE_NAME + ".Settings$NetworkSelectActivity");
                 intent.putExtra(Settings.EXTRA_SUB_ID, mSubId);
                 mSwitchPreference.setIntent(intent);
             }
diff --git a/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java b/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
index 8462228febd..7bc0dc10e1b 100644
--- a/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
+++ b/src/com/android/settings/network/telephony/gsm/OpenNetworkSelectPagePreferenceController.java
@@ -19,6 +19,8 @@ package com.android.settings.network.telephony.gsm;
 import static androidx.lifecycle.Lifecycle.Event.ON_START;
 import static androidx.lifecycle.Lifecycle.Event.ON_STOP;
 
+import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
+
 import android.content.Context;
 import android.content.Intent;
 import android.provider.Settings;
@@ -101,8 +103,8 @@ public class OpenNetworkSelectPagePreferenceController extends
                 != TelephonyManager.NETWORK_SELECTION_MODE_AUTO);
 
         Intent intent = new Intent();
-        intent.setClassName("com.android.settings",
-                "com.android.settings.Settings$NetworkSelectActivity");
+        intent.setClassName(SETTINGS_PACKAGE_NAME,
+                SETTINGS_PACKAGE_NAME + ".Settings$NetworkSelectActivity");
         intent.putExtra(Settings.EXTRA_SUB_ID, mSubId);
         preference.setIntent(intent);
     }