Merge "Allow apps with CREATE_USERS permission to create restricted users." into nyc-dev

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

@@ -2296,7 +2296,7 @@ public class UserManagerService extends IUserManager.Stub {
      */
     @Override
     public UserInfo createRestrictedProfile(String name, int parentUserId) {
-        checkManageUsersPermission("setupRestrictedProfile");
+        checkManageOrCreateUsersPermission("setupRestrictedProfile");
         final UserInfo user = createProfileForUser(name, UserInfo.FLAG_RESTRICTED, parentUserId);
         if (user == null) {
             return null;