Merge "Fix flaky test testDhcp6Pd_dualstack." into main