am 70fc04c8: Reorganize PackageManager dump to avoid NPE

* commit '70fc04c84db8f99ac2ac60fd9719b91057aacc9b':
  Reorganize PackageManager dump to avoid NPE