Merge "[MS05] Fix NetworkTemplate lint errors" am: 851c168716

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

Change-Id: I77b47e5689991a1fc60c6378dfef219c358db58a