Merge "ConnectivityManager: remove obsolete callback types"