Merge "Fix ConnectivityServiceTest#testNetworkCallbackMaximum"
am: f7929f37b9

Change-Id: I1cbe45eb339903630675713d287e3375c7c98e62
tree: dfee6828de0999c6f2f4fbd24baebf6bc2862c7e
  1. core/
  2. services/
  3. tests/