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

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

Change-Id: I084ce39fcc36aafe5976c15837f5f6287d82d1e4