Merge "Update ConnectivityDiagnosticsCallback function name." am: 35cba128cb

Change-Id: I51d625ac3c086aceba9c06be7585e0e4f5022f1a