Proposed fix for #18162.
Merge pull request #804 from oinopion/ticket18162

Fixes #18162 --  Specifying choices to Field overrides any form_class argument