[automerger skipped] Merge "Update ConnectivityDiagnosticsCallback function name." am: 5596ba1619 am: 5767d83c67 -s ours
am skip reason: Change-Id Ieea727ecee6cf358a53a215fd4b06233dfe967ea with SHA-1 22d0bfd7c4 is in history
Change-Id: I593e009d15d961fc44f5433cb8638aa7686d2b16
This commit is contained in: