[cockroach-admin-types] reorganize per RFD 619#9529

sunshowers merged 2 commits intomainoxidecomputer/omicron:mainfrom

sunshowers/spr/cockroach-admin-types-reorganize-per-rfd-619oxidecomputer/omicron:sunshowers/spr/cockroach-admin-types-reorganize-per-rfd-619Copy head branch name to clipboard