Merge "Rewrite dumping NSSL hierarchy" into sc-v2-dev am: 2bb5aa5527 am: dddddb6e3b

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

Change-Id: I1618193cc5187987a09e420ebfd576cf357ea107