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

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

Change-Id: I18a089195fa49826906164b9cad0dbd0772df844