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

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

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