Merge "Set underlying networks into NetworkCapabilities directly" am: 528c63e564

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

Change-Id: I06986217f5df6fa0641a6015876732e1b76dd6bb