Discouraging a private broadcast connection may be observable. Prevent this by keeping private broadcast connections outside normal discouragement handling. Misbehaving private broadcast peers are still disconnected.
Rebase of #36312 onto 31.x branch, since it could not be applied cleanly.