Merge "Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions http://b/35955593, http://b/35921499." am: 704520c392
am: 4cf199383f

Change-Id: I79234b267fccb31dfd53cf970a8da039654e684b