kv: fix conflict resolution for high-priority, non-txn'al requests#83366

Merged

craig[bot] merged 2 commits intocockroachdb:masterfrom nvanbenschoten:nvanbenschoten/exportPriority

Jul 6, 2022

+794-45

Commits on Jul 5, 2022