Merge "Merge "Add more info to dump" into tm-dev am: b0b4b466" into tm-d1-dev am: ae7d7976

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



Change-Id: I446d2e10fa895a748fa4786bf88c2fa10a6a4d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>