Merge pull request #18236 from vipulnsward/dont-eval-frozen

Fix html_safe string access modifying frozen values

Conflicts:
	activesupport/lib/active_support/core_ext/string/output_safety.rb