Merge "[MS50] Remove NetworkTemplate#buildTemplate* usages" am: 0ccb8750b9

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1943134

Change-Id: I763f17465055f64f42093fac721e06ac2c81b286