[automerger skipped] Merge "Update ConnectivityDiagnosticsCallback function name." am: 35cba128cb am: ee0f856d32 -s ours am: 1365b22e55 -s ours am: 292ddf563f -s ours

am skip reason: Change-Id Ieea727ecee6cf358a53a215fd4b06233dfe967ea with SHA-1 9347e33557 is in history

Change-Id: I343e785585470097bb0b0683533a3b411561f211