Merge "Revert "Only dump necessary info when specifying a package"" into sc-dev am: 7708fd97

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15433531

Change-Id: I9333a7a285b4c8379352f65ac6b68044a8a31c11