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 am: 4d14f249 am: ed2e4026

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



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