Merge "Update challenge size check" am: 1be04ec2d2

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

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