Merge "[MS12.2] Add unit test for NetworkTemplate builder" am: 05e12e6f79

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1928058

Change-Id: I1fac2bcf8bab7c802e7ca47ee5e3db7b0aa65b08