Merge "Add checks for different size of challenge" am: a95f69da2e am: 15ffcaf669 am: 6b32036b41 am: 3e925253ad

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

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