Merge "Fix typo in ConnectivityDiagnosticsManager constant." am: 5ee2390f0b am: 406345a19c

Change-Id: Iab752a848a8017fbfdc4517502d5a39d8201a682
tree: 422a7ec5dfb3476289d90b1d352b97cfe4c47788
  1. core/
  2. services/
  3. tests/