Merge "Spin off node generation logic into testable class" into sc-v2-dev am: 19128d77e3 am: 213f262de1

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

Change-Id: I58c7c95a0ed577c5303eb1b0c8fee8bd9fc70bd5