Merge "Replace buildTemplate* with NetworkTemplate.Builder" am: 1ba1febf2b am: be198dcc5c am: 953e6627c5

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

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