[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 am: e741b5fba8

Change-Id: Icf59442ec3eec898580465dfbd5bdd5dc78be644