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

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

Change-Id: I27b352ad1798dbe3a00fddd1ed8f527678177eb8