Merge "Replace VerificationToken with TimeStampToken." am: e2f4a21dd0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I968db7a1d1a715f4f95504f7d8ca4a9d210f4018