Merge "[MS12.1] Support NetworkTemplate builder" am: 00b74c9403

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

Change-Id: Id81797b2e5ede17dc6f5f6043246212086a2ffa5