Merge "[MS12.1] Support NetworkTemplate builder" am: 6609167efe am: 4aabc795be

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

Change-Id: Ice1121e374744e0cc5269e3d6bb10cf0c7a1f9ad
tree: 0634991bfe2c0205ef0c078578c156961e3136b2
  1. framework/
  2. framework-t/
  3. service-t/
  4. services/
  5. tests/