am 8806fc72: am 70fc04c8: Reorganize PackageManager dump to avoid NPE

* commit '8806fc729b96bf806806ef8d82147d59abfc1536':
  Reorganize PackageManager dump to avoid NPE