[pm] fix NPE in deletePackageX

Addressing the NPE as we investigate the interaction between system
package update uninstallation and the computer snapshots.

+ Some simple renaming

Test: builds
BUG: 206987577
Change-Id: I60765cc83f2d9a6cf8a02db22c37612f204bce29