Merge "PrivateAddressCoordinator: get rid of UpstreamNetworkState for updateUpstreamPrefix()" into main