Merge "Challenge is expected in timestamp token in case 2" am: 51471dcf am:...

Merge "Challenge is expected in timestamp token in case 2" am: 51471dcf am: aa54976b am: 86a83243

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2574790



Change-Id: I36b53c635b8c3a288c20fd16e31df808ce837e73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>