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

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

Change-Id: I1521f16148527ddfd8a816419d721c1fe74d660f