Drupal9-compatibility-2

nv dai requested to merge issue/google_analytics_et-3219258:3219258-drupal9-compatibility-2 into 8.x-2.x Jun 17, 2021