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

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

Change-Id: Iaa9a7094b4276e40849ad6eb58860176656eef16