Merge "ConnectivityManager: no double NetworkCallback registration" am: 06a192fa49
am: 5983a772cb

Change-Id: Ic36fbd67d92df0d9f70fe26d6aee92ee782bfb3c