Merge "Add new APIs in NetworkCapabilities to set and get underlying networks" am: 39379a40bd am: f96e107603

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1829934

Change-Id: Ie9f6c3c47272df0334bedeecc36fc6711e96340f