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

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

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