[SimplifyCFG] Tweak heuristic for merging conditional stores

We were correctly skipping dbginfo intrinsics and terminators, but the initial bailout wasn't, causing it to bail out on almost any block.

llvm-svn: 252152