Merge "Replace buildTemplate* with NetworkTemplate.Builder" am: b892406528

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933089

Change-Id: I1ebee1b55bf0627f0d3f6a0c61ff92d9e7365d67