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

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

Change-Id: Id02c5abe82816b2970655bc18e80b31d089d1d96