Merge "Revert "Only dump necessary info when specifying a package"" into...

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

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

Change-Id: If5b7c5c4354f2844f1404f74ac98e7036fe2a517