Merge "KeyMint: Fix timestamp token argument name." am: c76b9d9ffe

Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/1554747

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib262ad8cb753b7feee1d3cb3eaf08c75f1553ff2