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

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

Change-Id: I347434b77acfba34c1d05b8e99dca742709a9056