Merge "ConnectivityManager: allow custom Handlers"