Merge "Fix flake in testConnectivityDiagnosticsCallbackOnConnectivityReported"