diff --git a/framework/src/android/net/NetworkCapabilities.java b/framework/src/android/net/NetworkCapabilities.java
index ca2db5123c..a4aac2f082 100644
--- a/framework/src/android/net/NetworkCapabilities.java
+++ b/framework/src/android/net/NetworkCapabilities.java
@@ -3566,7 +3566,7 @@ public final class NetworkCapabilities implements Parcelable {
          * mainline version but deployed to older platforms which don't have those two
          * NetworkSpecifier methods.
          * <p>
-         * See {@link #createWithLocationInfoSanitizedIfNecessaryWhenParceled} and {@link
+         * See {@link #createWithSensitiveInfoSanitizedIfNecessaryWhenParceled} and {@link
          * #ensureSufficientPermissionsForRequest} for how this method should be used.
          */
         @Nullable
diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java
index 1317fc869d..4d70a593d4 100644
--- a/service/src/com/android/server/ConnectivityService.java
+++ b/service/src/com/android/server/ConnectivityService.java
@@ -2906,7 +2906,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
                     && !result.containsKey(nai.network)) {
                 result.put(
                         nai.network,
-                        createWithLocationInfoSanitizedIfNecessaryWhenParceled(
+                        createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
                                 nc, false /* includeLocationSensitiveInfo */,
                                 getCallingPid(), mDeps.getCallingUid(), callingPackageName,
                                 callingAttributionTag));
@@ -2921,7 +2921,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
                 if (null != nc) {
                     result.put(
                             network,
-                            createWithLocationInfoSanitizedIfNecessaryWhenParceled(
+                            createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
                                     nc,
                                     false /* includeLocationSensitiveInfo */,
                                     getCallingPid(), mDeps.getCallingUid(), callingPackageName,
@@ -3129,7 +3129,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
             @Nullable String callingAttributionTag) {
         mAppOpsManager.checkPackage(mDeps.getCallingUid(), callingPackageName);
         enforceAccessPermission();
-        return createWithLocationInfoSanitizedIfNecessaryWhenParceled(
+        return createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
                 getNetworkCapabilitiesInternal(network),
                 false /* includeLocationSensitiveInfo */,
                 getCallingPid(), mDeps.getCallingUid(), callingPackageName, callingAttributionTag);
@@ -3145,7 +3145,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
         if (!hasAccessPermission(-1 /* pid */, uid)) {
             return null;
         }
-        return createWithLocationInfoSanitizedIfNecessaryWhenParceled(
+        return createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
                 nc, true /* includeLocationSensitiveInfo */, -1 /* callingPid */, uid, packageName,
                 callingAttributionTag);
     }
@@ -3300,7 +3300,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
 
     @VisibleForTesting
     @Nullable
-    NetworkCapabilities createWithLocationInfoSanitizedIfNecessaryWhenParceled(
+    NetworkCapabilities createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
             @Nullable NetworkCapabilities nc, boolean includeLocationSensitiveInfo,
             int callingPid, int callingUid, @NonNull String callingPkgName,
             @Nullable String callingAttributionTag) {
@@ -11819,7 +11819,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
         switch (notificationType) {
             case CALLBACK_RESERVED: {
                 final NetworkCapabilities nc =
-                        createWithLocationInfoSanitizedIfNecessaryWhenParceled(
+                        createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
                                 nri.getReservedCapabilities(), includeLocationSensitiveInfo,
                                 nri.mPid, nri.mUid, nrForCallback.getRequestorPackageName(),
                                 nri.mCallingAttributionTag);
@@ -11828,7 +11828,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
             }
             case CALLBACK_AVAILABLE: {
                 final NetworkCapabilities nc =
-                        createWithLocationInfoSanitizedIfNecessaryWhenParceled(
+                        createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
                                 networkAgent.networkCapabilities, includeLocationSensitiveInfo,
                                 nri.mPid, nri.mUid, nrForCallback.getRequestorPackageName(),
                                 nri.mCallingAttributionTag);
@@ -11845,7 +11845,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
                 // networkAgent can't be null as it has been accessed a few lines above.
                 putParcelable(
                         bundle,
-                        createWithLocationInfoSanitizedIfNecessaryWhenParceled(
+                        createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
                                 networkAgent.networkCapabilities, includeLocationSensitiveInfo,
                                 nri.mPid, nri.mUid, nrForCallback.getRequestorPackageName(),
                                 nri.mCallingAttributionTag));
diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
index 63e7fe950f..b3f4a7fd54 100644
--- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
@@ -12452,7 +12452,7 @@ public class ConnectivityServiceTest {
             boolean includeLocationSensitiveInfo) {
         final NetworkCapabilities netCap = new NetworkCapabilities().setOwnerUid(ownerUid);
 
-        return mService.createWithLocationInfoSanitizedIfNecessaryWhenParceled(
+        return mService.createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
                 netCap, includeLocationSensitiveInfo, Process.myUid(), callerUid,
                 mContext.getPackageName(), getAttributionTag())
                 .getOwnerUid();
@@ -12466,7 +12466,7 @@ public class ConnectivityServiceTest {
         final NetworkCapabilities netCap =
                 new NetworkCapabilities().setTransportInfo(transportInfo);
 
-        mService.createWithLocationInfoSanitizedIfNecessaryWhenParceled(
+        mService.createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
                 netCap, includeLocationSensitiveInfo, Process.myPid(), callerUid,
                 mContext.getPackageName(), getAttributionTag());
         if (shouldMakeCopyWithLocationSensitiveFieldsParcelable) {
@@ -12624,7 +12624,7 @@ public class ConnectivityServiceTest {
         final NetworkCapabilities netCap =
                 new NetworkCapabilities().setTransportInfo(transportInfo);
 
-        mService.createWithLocationInfoSanitizedIfNecessaryWhenParceled(
+        mService.createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
                 netCap, false /* includeLocationSensitiveInfoInTransportInfo */,
                 Process.myPid(), Process.myUid(),
                 mContext.getPackageName(), getAttributionTag());
@@ -12643,7 +12643,7 @@ public class ConnectivityServiceTest {
         final NetworkCapabilities netCap =
                 new NetworkCapabilities().setTransportInfo(transportInfo);
 
-        mService.createWithLocationInfoSanitizedIfNecessaryWhenParceled(
+        mService.createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
                 netCap, false /* includeLocationSensitiveInfoInTransportInfo */,
                 Process.myPid(), Process.myUid(),
                 mContext.getPackageName(), getAttributionTag());
@@ -12663,7 +12663,7 @@ public class ConnectivityServiceTest {
         final NetworkCapabilities netCap =
                 new NetworkCapabilities().setTransportInfo(transportInfo);
 
-        mService.createWithLocationInfoSanitizedIfNecessaryWhenParceled(
+        mService.createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
                 netCap, false /* includeLocationSensitiveInfoInTransportInfo */,
                 Process.myPid(), Process.myUid(),
                 mContext.getPackageName(), getAttributionTag());
@@ -12682,7 +12682,7 @@ public class ConnectivityServiceTest {
         final NetworkCapabilities netCap =
                 new NetworkCapabilities().setTransportInfo(transportInfo);
 
-        mService.createWithLocationInfoSanitizedIfNecessaryWhenParceled(
+        mService.createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
                 netCap, false /* includeLocationSensitiveInfoInTransportInfo */,
                 Process.myPid(), Process.myUid(),
                 mContext.getPackageName(), getAttributionTag());
@@ -17505,7 +17505,7 @@ public class ConnectivityServiceTest {
         nc.setSubscriptionIds(subIds);
 
         final NetworkCapabilities result =
-                mService.createWithLocationInfoSanitizedIfNecessaryWhenParceled(
+                mService.createWithSensitiveInfoSanitizedIfNecessaryWhenParceled(
                         nc, false /* includeLocationSensitiveInfo */, Process.myPid(),
                         Process.myUid(), mContext.getPackageName(), getAttributionTag());
         assertEquals(subIds, result.getSubscriptionIds());