Merge "Update challenge size check" am: 1be04ec2d2 am: 40d4cc52a5

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

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