Merge pull request #16148 from rails/fix_json_autoload

Fix json autoload
Conflicts:
	activesupport/CHANGELOG.md
Fixed CHANGELOG formating [ci skip]