Merge "Replace VerificationToken with TimeStampToken." am: e2f4a21dd0 am: 6bf22acb73

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iada2078bc4f43104a05bebad525f0d52af550d37