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

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

Change-Id: I8b868833c50a8401ee751e8e95f3ee3e54f9a222