Merge "Add buildNetworkTemplateForUpstreamType() helper method" into main am: 0fd9d77ce9

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

Change-Id: Id91e30e66711a153109b3fec02a6e794881f00d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>