Merge "Fix typo in ConnectivityDiagnosticsManager constant." am: d222986acd

Change-Id: Icaae03ca1895de4012deed1c1b81b16fad4ba439