Merge "Remove the admin from the removing list when refreshing that admin." into nyc-dev

                        && getActiveAdminUncheckedLocked(adminReceiver, userHandle) != null) {

                    throw new IllegalArgumentException("Admin is already added");

                }

                if (policy.mRemovingAdmins.contains(adminReceiver)) {

                    throw new IllegalArgumentException(

                            "Trying to set an admin which is being removed");

                }

                ActiveAdmin newAdmin = new ActiveAdmin(info, /* parent */ false);

                policy.mAdminMap.put(adminReceiver, newAdmin);

                int replaceIndex = -1;