Merge "Implement registerSystemDefaultNetworkCallback replacement in api30"