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

Change-Id: Iab752a848a8017fbfdc4517502d5a39d8201a682