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

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

Change-Id: I374da44a9e6a95301f7619bcb7247dc4589279a1