Improve dump detail am: 7bdcb188b2 am: 7bfb37719d

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

Change-Id: Icc8b52c4a631234440cadd311ee24f85f7d66922