[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: 80f98d1f6d

Change-Id: I4f0bbda6f8128f9042e05d07072362bd5f755c85