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

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

Change-Id: I963c619229d1c1f49b4dc02a016b8ab42bdc234a