Merge "Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions http://b/35955593, http://b/35921499." am: 704520c392 am: 052f041730
am: 22d4258a75

Change-Id: I8e66e223003a38735b707d21d7bedb19170b1937
tree: 0e6c66b99fbcfa179ecb16f53501f2a80768bc81
  1. core/
  2. services/
  3. tests/