Auto merge of #3329 - Turbo87:htmlsafe, r=pichfl

Import `htmlSafe` from `@ember/template`

This should resolve a few of the deprecation warnings that got introduced with Ember 3.25

Author: bors

app/helpers/format-email.js

@@ -1,5 +1,5 @@
 import { helper } from '@ember/component/helper';
-import { htmlSafe } from '@ember/string';
+import { htmlSafe } from '@ember/template';
 import Ember from 'ember';
 
 const escape = Ember.Handlebars.Utils.escapeExpression;

app/services/progress.js

@@ -1,5 +1,5 @@
 import Service, { inject as service } from '@ember/service';
-import { htmlSafe } from '@ember/string';
+import { htmlSafe } from '@ember/template';
 import { tracked } from '@glimmer/tracking';
 import Ember from 'ember';