Merge "[MS51] Remove NetworkTemplate#buildTemplate* usages from SettingsLib" am: 69e3121b91 am: 5aea5bc651

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

Change-Id: Iae13b28d2e9dceeeb0d40e2f8b9846a8b03c8b93