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

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



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