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

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

Change-Id: I2a52227b981ef2da7387b5184bbd882776264a46