Merge "[TestOnly] Use probeV4TetheringConnectivity in getClatIpv6Address"