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

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

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