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: I8eaf30eee8e57efc8943f5e94d6c297c32bb5298