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: 847ca372 am: e19a5112

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

Change-Id: I751ab0e920c8dad70d5763f0499b45a66dc2499e