diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 72bfa1123c6..387fe23cae5 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -419,7 +419,7 @@ public final class Utils extends com.android.settingslib.Utils {
     public static UserHandle getManagedProfile(UserManager userManager) {
         final List<UserHandle> userProfiles = userManager.getUserProfiles();
         for (UserHandle profile : userProfiles) {
-            if (profile.getIdentifier() == userManager.getUserHandle()) {
+            if (profile.getIdentifier() == userManager.getProcessUserId()) {
                 continue;
             }
             final UserInfo userInfo = userManager.getUserInfo(profile.getIdentifier());
diff --git a/src/com/android/settings/applications/AppStateAppOpsBridge.java b/src/com/android/settings/applications/AppStateAppOpsBridge.java
index 2ccdc78413a..80d62b2eac8 100755
--- a/src/com/android/settings/applications/AppStateAppOpsBridge.java
+++ b/src/com/android/settings/applications/AppStateAppOpsBridge.java
@@ -301,8 +301,8 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {
         if (entries == null) {
             return 0;
         }
-        final ArrayMap<String, PermissionState> entriesForProfile = entries.get(mUserManager
-                .getUserHandle());
+        final ArrayMap<String, PermissionState> entriesForProfile =
+                entries.get(mUserManager.getProcessUserId());
         if (entriesForProfile == null) {
             return 0;
         }
@@ -316,8 +316,8 @@ public abstract class AppStateAppOpsBridge extends AppStateBaseBridge {
         }
         loadPermissionsStates(entries);
         loadAppOpsStates(entries);
-        final ArrayMap<String, PermissionState> entriesForProfile = entries.get(mUserManager
-                .getUserHandle());
+        final ArrayMap<String, PermissionState> entriesForProfile =
+                entries.get(mUserManager.getProcessUserId());
         if (entriesForProfile == null) {
             return 0;
         }
diff --git a/src/com/android/settings/network/apn/ApnSettings.java b/src/com/android/settings/network/apn/ApnSettings.java
index 4df2e5ee38c..73e9de75905 100755
--- a/src/com/android/settings/network/apn/ApnSettings.java
+++ b/src/com/android/settings/network/apn/ApnSettings.java
@@ -301,7 +301,7 @@ public class ApnSettings extends RestrictedSettingsFragment
 
     @Override
     public EnforcedAdmin getRestrictionEnforcedAdmin() {
-        final UserHandle user = UserHandle.of(mUserManager.getUserHandle());
+        final UserHandle user = UserHandle.of(mUserManager.getProcessUserId());
         if (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS, user)
                 && !mUserManager.hasBaseUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS,
                         user)) {
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
index 9ec7f0b550a..8fcdaa238fe 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
@@ -194,7 +194,7 @@ public class DefaultAutofillPickerTest {
                 .thenReturn(Arrays.asList(mainUserHandle, managedUserHandle));
         when(mUserManager.getUserInfo(MANAGED_PROFILE_UID))
                 .thenReturn(managedUserInfo);
-        when(mUserManager.getUserHandle()).thenReturn(MAIN_PROFILE_UID);
+        when(mUserManager.getProcessUserId()).thenReturn(MAIN_PROFILE_UID);
     }
 
     private void setupCaller() {
diff --git a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
index 4e1e600056b..9a5cb4223de 100644
--- a/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationEnablerTest.java
@@ -15,14 +15,11 @@
  */
 package com.android.settings.location;
 
-import static android.Manifest.permission.WRITE_SECURE_SETTINGS;
-
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.mock;
@@ -31,11 +28,9 @@ import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.app.ActivityManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.UserInfo;
-import android.location.LocationManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
@@ -207,7 +202,7 @@ public class LocationEnablerTest {
         when(userHandle.getIdentifier()).thenReturn(5);
         userProfiles.add(userHandle);
         when(mUserManager.getUserProfiles()).thenReturn(userProfiles);
-        when(mUserManager.getUserHandle()).thenReturn(1);
+        when(mUserManager.getProcessUserId()).thenReturn(1);
         when(mUserManager.getUserInfo(5))
                 .thenReturn(new UserInfo(5, "user 5", UserInfo.FLAG_MANAGED_PROFILE));
     }
diff --git a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java
index b4bda14af59..03f46638672 100644
--- a/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/location/LocationForWorkPreferenceControllerTest.java
@@ -178,7 +178,7 @@ public class LocationForWorkPreferenceControllerTest {
         when(mUserHandle.getIdentifier()).thenReturn(5);
         userProfiles.add(mUserHandle);
         when(mUserManager.getUserProfiles()).thenReturn(userProfiles);
-        when(mUserManager.getUserHandle()).thenReturn(1);
+        when(mUserManager.getProcessUserId()).thenReturn(1);
         when(mUserManager.getUserInfo(5))
                 .thenReturn(new UserInfo(5, "user 5", UserInfo.FLAG_MANAGED_PROFILE));
     }
diff --git a/tests/unit/src/com/android/settings/enterprise/ActionDisabledLearnMoreButtonLauncherImplTest.java b/tests/unit/src/com/android/settings/enterprise/ActionDisabledLearnMoreButtonLauncherImplTest.java
index 0b0b8e5f91f..b8dc92e764b 100644
--- a/tests/unit/src/com/android/settings/enterprise/ActionDisabledLearnMoreButtonLauncherImplTest.java
+++ b/tests/unit/src/com/android/settings/enterprise/ActionDisabledLearnMoreButtonLauncherImplTest.java
@@ -88,7 +88,7 @@ public class ActionDisabledLearnMoreButtonLauncherImplTest {
         when(mActivity.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
 
         when(mActivity.getUserId()).thenReturn(CONTEXT_USER_ID);
-        when(mUserManager.getUserHandle()).thenReturn(CONTEXT_USER_ID);
+        when(mUserManager.getProcessUserId()).thenReturn(CONTEXT_USER_ID);
 
         mImpl = new ActionDisabledLearnMoreButtonLauncherImpl(mActivity, mBuilder);
     }