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

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

Change-Id: Ifc1e7f9711409f049b14059632d7d936ba899828