Merge "Fix NPE in dump and add additional dump data" am: 36478cfdaa

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

Change-Id: I0542725ae7f4402c1940848b299ee6eac945bae6