Merge "Revert^2 "Fix flakes due to tests resetting CarrierConfig"" into main