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

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

Change-Id: I7cac7add6aa1d92f2b282ec75ab5b1be83cde24b