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

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

Change-Id: I2ca963ea3b9196302ab31fe1b4972492af85b19d