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

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

Change-Id: Ifae1718d5fe1592b71996483b030c15eafb0be4d