[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
am: 9ec505fbea

Change-Id: Ife1ebe5da92332743395dc496fca877f202d81e3