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

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

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