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

Merge "Only dump necessary info when specifying a package" into sc-dev am: dbdfbda7 am: 3b065884

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

Change-Id: I4f677b506e1958e48f10aa2952e12367c3ab9698