Drupal 12 compatibility fixes for Address 2.1.x

Ben Stallingsrequested to merge
issue/address-3637489:3637489-drupal-12-compatibility into 2.1.x

Closes #3637489

Merge request reports