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

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

Change-Id: Ice1121e374744e0cc5269e3d6bb10cf0c7a1f9ad