Merge "Add underlying networks into NetworkAgentInfo if any" am: 9c9850b944 am: 6f824bad06 am: 00e4e8579b am: ad068bd3c8

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

Change-Id: I9a12e6d10611b0f5dace2ed1896bcc8738213699