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

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

Change-Id: Id59d0bab5db74c9de6c956457072589b16bdcb36