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

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

Change-Id: If7ef10b79a52be6cbfdcb1297b93c0f88b0b1202