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

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

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