django.utils.safestring.SafeText

I mentioned this in a change making use of this, but it applies here.
I don't think we should require that text be set in the subclass to start with <p> if is_html is True. That should be handled here if no tags are present. In fact, we can go a step further and simplify this code in the process, and break the logic out so it's not duplicated.

def _render_text(self, text, is_html):
    if is_html:
        text = mark_safe(text)

    text = conditional_escape(text)

    if not text.startswith('<') and not text.endswith('>'):
        text = format_html('<p>{0}</p>', text)

    return text


This way, <p> is applied for the plain text case, and for the HTML case if outer tags aren't already present.
It also properly handles safe text that's coming in (which allows the existing form we have where mark_safe is called -- honestly, we need to ship this code fast so I don't want to redo all the consent requirements again, and handling the existing case is going to be helpful there).

django.utils.safestring.SafeText

I forgot where we were with this. I remember postponing due to GDPR deadlines. Looks like some fixes were made but not published.