Virginia’s April redistricting vote is colliding with Gov. Abigail Spanberger’s changes to major gun bills, creating a high-stakes fight over gerrymandering and the Second Amendment.