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

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

Change-Id: Ib097afe9d0c2ed0d0cec159021eb1bce25e17782