Merge "Add NetworkCapabilities transport types into NetworkIdentity." into main