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

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

Change-Id: Idd7277cc1f4b13ed037a8f0a3c25b27e0f1fd624