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

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



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