[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
am: 41098808ea

Change-Id: Ife691c79c81c2a4b66f290a15f0799c15fe8fff3