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

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

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