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

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

Change-Id: I0c9e3932c9914c0b78d144912ea2f16d3afa714e