Merge pull request #12621 from laurocaetano/fix_has_one_association_with_primary_key_set

Save association when primary key is manually set

Conflicts:
	activerecord/CHANGELOG.md

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/autosave_association.rb