Content moderation state filter incorrectly groups content type condition

Problem/Motivation

If you have the content moderation state filter in an OR group, then it adds a bundle condition to that group which bypasses the moderation state filter itself.

1. Enable content moderation, workflows, and views UI.
2. Enable the workflow for at least one content type at /admin/config/workflow/workflows/manage/editorial.
3. Edit the moderated content view at /admin/structure/views/view/moderated_content.
4. Set up the conditions so that it matches the following example structure:
   1. Default group is an And group with Content revision: Is Latest Translation Affected Revision.
   2. Group 2 is an Or group with Content revision: Moderation state <> Published and (Get the actual content from a content revision.) Content: Changed > -1 day.
   3. The logical operator between the Default group and Group 2 is And.

   

5. Preview the query.

You end up with something like the following where clause:

WHERE
  ((node_field_revision2.nid IS NULL) AND (node_field_revision.revision_translation_affected = '1')) AND
  ((node.type IN ('article', 'page')) OR
  ((content_moderation_state.workflow = 'editorial') AND (content_moderation_state.moderation_state <> 'published')) OR
  ((node_field_data_node_field_revision.changed > 1581335239-86400)))

Rather than showing content that is an article and page and is in the correct moderation state, it will show me content that is either an article/page or is not in the published state. I think that's because the bundle condition is added directly to the group:

$this->query->addWhere($this->options['group'], "$entity_base_table_alias.{$entity_type->getKey('bundle')}", $moderated_bundles, 'IN');

Which contrasts to how the workflow and state IDs are handled further down:

    // The values are strings composed from the workflow ID and the state ID, so
    // we need to create a complex WHERE condition.
    $field = new Condition('OR');
    foreach ((array) $this->value as $value) {
      list($workflow_id, $state_id) = explode('-', $value, 2);

      $and = new Condition('AND');
      $and
        ->condition("$this->tableAlias.workflow", $workflow_id, '=')
        ->condition("$this->tableAlias.$this->realField", $state_id, $operator);

      $field->condition($and);
    }

    $this->query->addWhere($this->options['group'], $field);

Proposed resolution

Ensure an AND is used between the bundle condition and the workflow/state conditions (rather than just inheriting the current group's).

Remaining tasks

1. Review the patch