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 am: d5294fd5

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

Change-Id: I94ef9b290c634503269fbea384109c74b5c3cc04