Merge "Add checks for different size of challenge" am: a95f69da am: 15ffcaf6 am: 6b32036b

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



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