Merge "[MS65.2] Add unit test of NetworkIdentity#Builder" am: 7f3f9c1be0

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

Change-Id: I1b41ced1782d07b40397c894cd127d286ed00b2a