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

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

Change-Id: I7088e9c75ccafaad961e15c83a68f843dddf9b9d