Merge "Fix atest build error in settings.fuelgauge." into main