Merge "Revert "ConnectivityManager#registerNetworkAgent gains an argument"" into main