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

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



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