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

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

Change-Id: I07f6f57ff7b3bd56b7dc51fa46cbcbc9068baff0