Merge "ConnectivityManager: simplify callback handler"