CircularDependencyError when there's a foreign key to a model with PermissionsMixin

[Richard Eames]

I have the following models in my project. Running makemigration works, but running migrate causes a CircularDependencyError.

from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin
from django.db import models

class Employee(AbstractBaseUser, PermissionsMixin):
        USERNAME_FIELD = 'id'

class ModelA(models.Model):
        person = models.ForeignKey(Employee, blank = True, null = True, default = None)

I think this could be related to #22485 and/or #21968 but I'm not sure.
Test project attached.

[Richard Eames]

Minimal test project

[Tim Graham]

It seems like it's probably a duplicate of #22325.