Merge "Finish rename of related users to profiles."

core/java/android/os/UserManager.java

@@ -415,15 +415,6 @@ public class UserManager {
         }
     }
 
-    /**
-     * Renamed, just present to avoid multi project commit.
-     * TODO delete.
-     * @hide
-     */
-    public UserInfo createRelatedUser(String name, int flags, int relatedUserId) {
-        return createProfileForUser(name, flags, relatedUserId);
-    }
-
     /**
      * Creates a user with the specified name and options as a profile of another user.
      * Requires {@link android.Manifest.permission#MANAGE_USERS} permission.
@@ -468,15 +459,6 @@ public class UserManager {
         }
     }
 
-    /**
-     * Renaming, left to avoid multi project commit.
-     * TODO Delete.
-     * @hide
-     */
-    public List<UserInfo> getRelatedUsers(int userHandle) {
-        return getProfiles(userHandle);
-    }
-
     /**
      * Returns list of the profiles of userHandle including
      * userHandle itself.