[orchestrator] fix bug in device ID update

If CP flow is skipped because a device is already in TEST_LOCKED* state,
then the device ID constructed during FT will be the final device ID.
This is what should be used to update the database with.

Signed-off-by: Tim Trippel <[email protected]>
(cherry picked from commit 76d0596)

Author: timothytrippel

sw/host/provisioning/orchestrator/src/ot_dut.py

@@ -314,11 +314,13 @@ def run_ft(self) -> None:
             device_id_in_otp = DeviceId.from_hexstr(self.ft_data["device_id"])
             if device_id_in_otp != self.device_id:
                 logging.error(
-                    "Device ID from OTP does not match expected on host.")
+                    "Device ID from OTP does not match expected on host. Use OTP variant?"
+                )
                 logging.error(
                     f"Final (device) DeviceId: {device_id_in_otp.to_hexstr()}")
                 logging.error(
                     f"Final (host)   DeviceId: {self.device_id.to_hexstr()}")
                 confirm()
+                self.device_id = device_id_in_otp
 
             logging.info("FT completed successfully.")