Only remove leading '0x' from apt key ids, not all 0s

This fixes a bug introduced by #4544