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

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

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