Merge "ConnectivityManager#registerNetworkAgent gains an argument" into main