[automerger skipped] Merge "Replace buildTemplate* with...

[automerger skipped] Merge "Replace buildTemplate* with NetworkTemplate.Builder" am: b8924065 am: 2b319b14 am: fede4b95 am: e3b1b23b -s ours

am skip reason: Merged-In I5d84d13a75dbafb286e9754421ed17f52c6e22b9 with SHA-1 c46661ee is already in history

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

Change-Id: I75522b59a35113425b753c943421899debce5bc2