Merge "Replace 2 synchronized blocks with one in revokeUserAdmin method"

    @Override

    public void revokeUserAdmin(@UserIdInt int userId) {

        checkManageUserAndAcrossUsersFullPermission("revoke admin privileges");

        synchronized (mPackagesLock) {

            UserInfo info;

            synchronized (mUsersLock) {

                info = getUserInfoLU(userId);

            }

            if (info == null || !info.isAdmin()) {

                UserData user = getUserDataLU(userId);

                if (user == null || !user.info.isAdmin()) {

                    // Exit if no user found with that id, or the user is not an Admin.

                    return;

                }

            info.flags ^= UserInfo.FLAG_ADMIN;

            synchronized (mUsersLock) {

                writeUserLP(getUserDataLU(info.id));

                user.info.flags ^= UserInfo.FLAG_ADMIN;

                writeUserLP(user);

            }

        }

    }