A. Incorrect. That's a common expression, but no.
B. Correct. The Church teaches that those who are killed for the sake of the faith, without having been baptized are "baptized by their death for and with Christ" (Catechism of the Catholic Church). "This Baptism of blood, like the desire for Baptism, brings about the fruits of Baptism without being a sacrament."