Merge "[MS05] Fix NetworkTemplate lint errors" am: 06bba324a8

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

Change-Id: I77b47e5689991a1fc60c6378dfef219c358db58a
tree: f801a519adde3286d22753c60f739df7298443fe
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/