Merge "Add checks for different size of challenge" am: a95f69da am:...

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

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



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