Merge "Fix testDhcpClientCaptivePortalApiEnabled flakes"