Merge "Fix NPE" am: c59e4b774c am: 999219b9fb

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1495856

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I37b998fbb2c00b92695dbdd4ca564a11a72435ea

services/core/java/com/android/server/pm/UserManagerService.java

@@ -5183,6 +5183,9 @@ public class UserManagerService extends IUserManager.Stub {
                                 debugMsg + " for another profile "
                                         + targetUserId + " from " + callingUserId);
                     }
+                    Slog.w(LOG_TAG, debugMsg + " for another profile "
+                            + targetUserId + " from " + callingUserId);
+                    return false;
                 }
 
                 UserInfo targetUserInfo = getUserInfoLU(targetUserId);