Merge "Add API surface for ConnectivityDiagnostics API."