Merge "Fix potential NPE when dumping child nodes" into main am: 88a077b7de am: a31c03e75c

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

Change-Id: I8e7b2cfbfadc3fb2d2dfe3f13c9c86a46fb2ad62
Signed-off-by: Automerger Merge Worker <[email protected]>