[automerger] [RESTRICT AUTOMERGE] STS retry issue: Clean up fingerprint handling to avoid checksum invalidation. Basically, we need the original device fingerprint when ensuring we have an eligible device fingerprint and the masked fingerprint when checks skipped: 0f854a3fda

Change-Id: I2c8fe5379442fc63063b6ca9a278ec8e24d19286