Co-authored-by: Gregory Sanders <gsanders87@gmail.com>
Note: unlike the original [[https://github.com/bitcoin/bitcoin/pull/17513/commits/567cb44eb95785c8df93a3844207d17f4c390372 | commit]],
this diff fails to remove a circular dependency.
This is part 4 of 5 of backport of Core PR17513
Depends on D7603