[automerger skipped] [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
am: 7a1581e7d7  -s ours

Change-Id: I894f1d1e8153ed8800d5b7314b3d4e9fac583d41