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

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

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