Merge "Fix typo in ConnectivityDiagnosticsManager constant." am: d222986acd am: 09d92456fa am: 836124db7e

Change-Id: I0677a6a31defcb6412f132dcbbfd54f02c82baf7