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: 8d4355e6

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

Change-Id: I4971701c04517a52349010f1e27874f0991a70f0