Merge "ConnectivityManager: no double NetworkCallback registration"